]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetcollapsable.C
the convert patch
[lyx.git] / src / insets / insetcollapsable.C
index 1e9d18f1dde0982c2be588147f05f01f8c6a8e78..17bf4215ca2097927b45b30401b05bf67d839cb7 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "buffer.h"
 #include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
 #include "LColor.h"
@@ -23,7 +24,6 @@
 #include "funcrequest.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
-#include "WordLangTuple.h"
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
@@ -35,423 +35,333 @@ using lyx::graphics::PreviewLoader;
 using std::endl;
 using std::string;
 using std::max;
+using std::min;
 using std::ostream;
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
-       : UpdatableInset(), inset(bp), collapsed_(collapsed),
-         button_dim(0, 0, 0, 0), label("Label"),
-#if 0
-       autocollapse(false),
-#endif
-         in_update(false), first_after_edit(false)
+void leaveInset(LCursor & cur, InsetBase const & in)
 {
-       inset.setOwner(this);
-       inset.setAutoBreakRows(true);
-       inset.setDrawFrame(InsetText::ALWAYS);
-       inset.setFrameColor(LColor::collapsableframe);
-       setInsetName("Collapsable");
-}
-
-
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
-       : UpdatableInset(in), inset(in.inset), collapsed_(in.collapsed_),
-         labelfont_(in.labelfont_), button_dim(0, 0, 0, 0), label(in.label),
-#if 0
-         autocollapse(in.autocollapse),
-#endif
-         in_update(false), first_after_edit(false)
-{
-       inset.setOwner(this);
+       for (unsigned int i = 0; i != cur.size(); ++i) {
+               if (&cur[i].inset() == &in) {
+                       cur.resize(i);
+                       return;
+               }
+       }
 }
 
 
-bool InsetCollapsable::insertInset(BufferView * bv, InsetOld * in)
+InsetCollapsable::InsetCollapsable
+               (BufferParams const & bp, CollapseStatus status)
+       : InsetText(bp), label("Label"), status_(status), openinlined_(false)
 {
-       if (!insetAllowed(in->lyxCode())) {
-               lyxerr << "InsetCollapsable::InsertInset: "
-                       "Unable to insert inset." << endl;
-               return false;
-       }
-       return inset.insertInset(bv, in);
+       setAutoBreakRows(true);
+       setDrawFrame(true);
+       setFrameColor(LColor::collapsableframe);
+       setInsetName("Collapsable");
+       setButtonLabel();
 }
 
 
 void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 {
-       os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
-       inset.writeParagraphData(buf, os);
+       os << "status ";
+       switch (status_) {
+       case Open:
+               os << "open";
+               break;
+       case Collapsed:
+               os << "collapsed";
+               break;
+       case Inlined:
+               os << "inlined";
+               break;
+       }
+       os << "\n";
+       text_.write(buf, os);
 }
 
 
 void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 {
+       bool token_found = false;
        if (lex.isOK()) {
                lex.next();
                string const token = lex.getString();
-               if (token == "collapsed") {
+               if (token == "status") {
                        lex.next();
-                       collapsed_ = lex.getBool();
+                       string const tmp_token = lex.getString();
+
+                       if (tmp_token == "inlined") {
+                               status_ = Inlined;
+                               token_found = true;
+                       } else if (tmp_token == "collapsed") {
+                               status_ = Collapsed;
+                               token_found = true;
+                       } else if (tmp_token == "open") {
+                               status_ = Open;
+                               token_found = true;
+                       } else {
+                               lyxerr << "InsetCollapsable::read: Missing status!"
+                                      << endl;
+                               // Take countermeasures
+                               lex.pushToken(token);
+                       }
                } else {
-                       lyxerr << "InsetCollapsable::Read: Missing collapsed!"
-                              << endl;
-                       // Take countermeasures
+                       lyxerr << "InsetCollapsable::read: Missing 'status'-tag!"
+                                  << endl;
+                       // take countermeasures
                        lex.pushToken(token);
                }
        }
-       inset.read(buf, lex);
-}
+       InsetText::read(buf, lex);
 
+       if (!token_found)
+               status_ = isOpen() ? Open : Collapsed;
 
-void InsetCollapsable::dimension_collapsed(Dimension & dim) const
-{
-       font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
+       setButtonLabel();
 }
 
 
-int InsetCollapsable::height_collapsed() const
+Dimension InsetCollapsable::dimensionCollapsed() const
 {
        Dimension dim;
        font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
-       return dim.asc + dim.des;
+       return dim;
 }
 
 
 void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       //lyxerr << "InsetCollapsable::metrics:  width: " << mi.base.textwidth << endl;
-       dimension_collapsed(dim);
-       if (!collapsed_) {
-               Dimension insetdim;
-               inset.metrics(mi, insetdim);
-               dim.des += insetdim.height() + TEXT_TO_BOTTOM_OFFSET;
-               dim.wid = max(dim.wid, insetdim.wid);
-       }
-       dim_ = dim;
-}
-
-
-void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
-{
-       pi.pain.buttonText(x, y, label, labelfont_);
-}
-
-
-void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
-{
-       Dimension dim_collapsed;
-       dimension_collapsed(dim_collapsed);
-
-       int const aa  = ascent();
-       button_dim.x1 = 0;
-       button_dim.x2 = dim_collapsed.width();
-       button_dim.y1 = -aa;
-       button_dim.y2 = -aa + dim_collapsed.height();
-
-       if (!isOpen()) {
-               draw_collapsed(pi, x, y);
-               return;
-       }
-
-       int old_x = x;
-
-       if (!owner())
-               x += scroll();
-
-       top_x = x;
-       top_baseline = y;
-
-       int const bl = y - aa + dim_collapsed.ascent();
-
-       if (inlined) {
-               inset.draw(pi, x, y);
+       mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
+       if (status_ == Inlined) {
+               InsetText::metrics(mi, dim);
        } else {
-               draw_collapsed(pi, old_x, bl);
-               inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
+               dim = dimensionCollapsed();
+               if (status_ == Open) {
+                       InsetText::metrics(mi, textdim_);
+                       openinlined_ = (textdim_.wid + dim.wid <= mi.base.textwidth);
+                       if (openinlined_) {
+                               dim.wid += textdim_.wid;
+                               dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
+                               dim.asc = textdim_.asc;
+                       } else {
+                               dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
+                               dim.wid = max(dim.wid, textdim_.wid);
+                       }
+               }
        }
+       dim.asc += TEXT_TO_INSET_OFFSET;
+       dim.des += TEXT_TO_INSET_OFFSET;
+       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+       mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+       dim_ = dim;
 }
 
 
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-       // by default, we are not inlined-drawing
-       draw(pi, x, y, false);
-}
-
-
-InsetOld::EDITABLE InsetCollapsable::editable() const
-{
-       return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
-}
-
-
-void InsetCollapsable::insetUnlock(BufferView * bv)
-{
-#if 0
-       if (autocollapse) {
-               if (change_label_with_text) {
-                       draw_label = get_new_label();
-               } else {
-                       draw_label = label;
+       const int xx = x + TEXT_TO_INSET_OFFSET;
+       if (status_ == Inlined) {
+               InsetText::draw(pi, xx, y);
+       } else {
+               Dimension dimc = dimensionCollapsed();
+               int const top  = y - ascent() + TEXT_TO_INSET_OFFSET;
+               button_dim.x1 = xx + 0;
+               button_dim.x2 = xx + dimc.width();
+               button_dim.y1 = top;
+               button_dim.y2 = top + dimc.height();
+
+               pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
+               if (status_ == Open) {
+                       int textx, texty;
+                       if (openinlined_) {
+                               textx = xx + dimc.width();
+                               texty = top + textdim_.asc;
+                       } else {
+                               textx = xx;
+                               texty = top + dimc.height() + textdim_.asc;
+                       }
+                       InsetText::draw(pi, textx, texty);
                }
-               collapsed_ = true;
        }
-#endif
-       inset.insetUnlock(bv);
-       if (scroll())
-               scroll(bv, 0.0F);
-       bv->updateInset(this);
+       setPosCache(pi, x, y);
 }
 
 
-FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
+void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
-       FuncRequest cmd1 = cmd;
-       cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
-       return cmd1;
+       x += TEXT_TO_INSET_OFFSET;
+       if (status_ == Open) {
+               if (openinlined_)
+                       x += dimensionCollapsed().wid;
+               else
+                       y += dimensionCollapsed().des + textdim_.asc;
+       }
+       if (status_ != Collapsed)
+               InsetText::drawSelection(pi, x, y);
 }
 
 
-void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
+void InsetCollapsable::getCursorPos
+       (CursorSlice const & sl, int & x, int & y) const
 {
-       bool ret = false;
-       BufferView * bv = cmd.view();
-
-       if (collapsed_ && cmd.button() != mouse_button::button3) {
-               collapsed_ = false;
-               bv->updateInset(this);
-               bv->buffer()->markDirty();
+       if (status_ == Collapsed) {
+               x = xo();
+               y = yo();
                return;
        }
 
-       if (cmd.button() != mouse_button::button3 && hitButton(cmd)) {
-               if (collapsed_) {
-                       collapsed_ = false;
-               } else {
-                       collapsed_ = true;
-                       bv->unlockInset(this);
-               }
-               bv->updateInset(this);
-               bv->buffer()->markDirty();
-       } else if (!collapsed_ && cmd.y > button_dim.y2) {
-               ret = inset.dispatch(adjustCommand(cmd)) == DispatchResult(true);
+       InsetText::getCursorPos(sl, x, y);
+       if (status_ == Open) {
+               if (openinlined_)
+                       x += dimensionCollapsed().wid;
+               else
+                       y += dimensionCollapsed().height() - ascent() + TEXT_TO_INSET_OFFSET + textdim_.asc;
        }
-       if (cmd.button() == mouse_button::button3 && !ret)
-               showInsetDialog(bv);
-}
-
 
-int InsetCollapsable::latex(Buffer const & buf, ostream & os,
-                           LatexRunParams const & runparams) const
-{
-       return inset.latex(buf, os, runparams);
+       x += TEXT_TO_INSET_OFFSET;
 }
 
 
-int InsetCollapsable::ascii(Buffer const & buf, ostream & os,
-                           LatexRunParams const & runparams) const
+InsetBase::EDITABLE InsetCollapsable::editable() const
 {
-       return inset.ascii(buf, os, runparams);
+       return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
-int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os,
-                              LatexRunParams const & runparams) const
+bool InsetCollapsable::descendable() const
 {
-       return inset.linuxdoc(buf, os, runparams);
+       return status_ != Collapsed;
 }
 
 
-int InsetCollapsable::docbook(Buffer const & buf, ostream & os,
-                             LatexRunParams const & runparams) const
-{
-       return inset.docbook(buf, os, runparams);
-}
-
-
-bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
+bool InsetCollapsable::hitButton(FuncRequest & cmd) const
 {
        return button_dim.contains(cmd.x, cmd.y);
 }
 
 
-void InsetCollapsable::edit(BufferView * bv, int index)
-{
-       lyxerr << "InsetCollapsable: edit" << endl;
-       if (!bv->lockInset(this))
-               lyxerr << "InsetCollapsable: can't lock index " << index << endl;
-       inset.dispatch(FuncRequest(bv, LFUN_INSET_EDIT, "left"));
-       first_after_edit = true;
-}
-
-
-DispatchResult
-InsetCollapsable::priv_dispatch(FuncRequest const & cmd,
-                               idx_type & idx, pos_type & pos)
+string const InsetCollapsable::getNewLabel(string const & l) const
 {
-       //lyxerr << "InsetCollapsable::localDispatch: "
-       //      << cmd.action << " '" << cmd.argument << "'\n";
-       BufferView * bv = cmd.view();
-       switch (cmd.action) {
-               case LFUN_INSET_EDIT: {
-                       if (!cmd.argument.empty()) {
-                               UpdatableInset::priv_dispatch(cmd, idx, pos);
-                               if (collapsed_) {
-                                       lyxerr << "branch collapsed_" << endl;
-                                       collapsed_ = false;
-                                       if (bv->lockInset(this)) {
-                                               bv->updateInset(this);
-                                               bv->buffer()->markDirty();
-                                               inset.dispatch(cmd);
-                                               first_after_edit = true;
-                                       }
-                               } else {
-                                       lyxerr << "branch not collapsed_" << endl;
-                                       if (bv->lockInset(this))
-                                               inset.dispatch(cmd);
-                               }
-                               return DispatchResult(true);
-                       }
-
-#ifdef WITH_WARNINGS
-#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
-#endif
-                       if (cmd.button() == mouse_button::button3)
-                               return DispatchResult(true);
-
-                       UpdatableInset::priv_dispatch(cmd, idx, pos);
-
-                       if (collapsed_) {
-                               collapsed_ = false;
-                               // set this only here as it should be recollapsed only if
-                               // it was already collapsed!
-                               first_after_edit = true;
-                               if (!bv->lockInset(this))
-                                       return DispatchResult(true);
-                               bv->updateInset(this);
-                               bv->buffer()->markDirty();
-                               inset.dispatch(cmd);
-                       } else {
-                               if (!bv->lockInset(this))
-                                       return DispatchResult(true);
-                               if (cmd.y <= button_dim.y2) {
-                                       FuncRequest cmd1 = cmd;
-                                       cmd1.y = 0;
-                                       inset.dispatch(cmd1);
-                               } else
-                                       inset.dispatch(adjustCommand(cmd));
-                       }
-                       return DispatchResult(true);
-               }
-
-               case LFUN_MOUSE_PRESS:
-                       if (!collapsed_ && cmd.y > button_dim.y2)
-                               inset.dispatch(adjustCommand(cmd));
-                       return DispatchResult(true);
-
-               case LFUN_MOUSE_MOTION:
-                       if (!collapsed_ && cmd.y > button_dim.y2)
-                               inset.dispatch(adjustCommand(cmd));
-                       return DispatchResult(true);
-
-               case LFUN_MOUSE_RELEASE:
-                       lfunMouseRelease(cmd);
-                       return DispatchResult(true);
-
-               default:
-                       DispatchResult const result = inset.dispatch(cmd);
-                       if (result.val() >= FINISHED)
-                               bv->unlockInset(this);
-                       first_after_edit = false;
-                       return result;
+       string label;
+       pos_type const max_length = 15;
+       pos_type const p_siz = paragraphs().begin()->size();
+       pos_type const n = min(max_length, p_siz);
+       pos_type i = 0;
+       pos_type j = 0;
+       for( ; i < n && j < p_siz; ++j) {
+               if (paragraphs().begin()->isInset(j))
+                       continue;
+               label += paragraphs().begin()->getChar(j);
+               ++i;
        }
-}
-
-
-bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
-{
-       if (&inset == in)
-               return true;
-       return inset.lockInsetInInset(bv, in);
-}
-
-
-bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
-                                         bool lr)
-{
-       if (&inset == in) {
-               bv->unlockInset(this);
-               return true;
+       if (paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
+               label += "...";
        }
-       return inset.unlockInsetInInset(bv, in, lr);
-}
-
-
-int InsetCollapsable::insetInInsetY() const
-{
-       return inset.insetInInsetY() - (top_baseline - inset.y());
-}
-
-
-void InsetCollapsable::validate(LaTeXFeatures & features) const
-{
-       inset.validate(features);
-}
-
-
-void InsetCollapsable::getCursor(BufferView & bv, int & x, int & y) const
-{
-       inset.getCursor(bv, x, y);
+       return label.empty() ? l : label;
 }
 
 
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
+void InsetCollapsable::edit(LCursor & cur, bool left)
 {
-       inset.getCursorPos(bv, x , y);
+       //lyxerr << "InsetCollapsable: edit left/right" << endl;
+       cur.push(*this);
+       InsetText::edit(cur, left);
+       open();
 }
 
 
-UpdatableInset * InsetCollapsable::getLockingInset() const
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y) const
 {
-       UpdatableInset * in = inset.getLockingInset();
-       if (&inset == in)
-               return const_cast<InsetCollapsable *>(this);
-       return in;
-}
-
-
-UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(InsetOld::Code c)
-{
-       if (c == lyxCode())
-               return this;
-       return inset.getFirstLockingInsetOfType(c);
+       //lyxerr << "InsetCollapsable: edit xy" << endl;
+       if (status_ == Collapsed) {
+               return const_cast<InsetCollapsable*>(this);
+       }
+       cur.push(const_cast<InsetCollapsable&>(*this));
+       return InsetText::editXY(cur, x, y);
 }
 
 
-void InsetCollapsable::setFont(BufferView * bv, LyXFont const & font,
-                              bool toggleall, bool selectall)
+void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       inset.setFont(bv, font, toggleall, selectall);
-}
-
+       lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd
+               << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl;
 
-LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
-                                      bool const recursive) const
-{
-       return inset.getLyXText(bv, recursive);
-}
+       switch (cmd.action) {
+       case LFUN_MOUSE_PRESS:
+               if (status_ == Inlined)
+                       InsetText::doDispatch(cur, cmd);
+               else if (status_ == Open && !hitButton(cmd))
+                       InsetText::doDispatch(cur, cmd);
+               else
+                       cur.noUpdate();
+               break;
+
+       case LFUN_MOUSE_MOTION:
+               if (status_ == Inlined)
+                       InsetText::doDispatch(cur, cmd);
+               else if (status_ == Open && !hitButton(cmd))
+                       InsetText::doDispatch(cur, cmd);
+               else
+                       cur.undispatched();
+               break;
+
+       case LFUN_MOUSE_RELEASE:
+               if (cmd.button() == mouse_button::button3) {
+                       showInsetDialog(&cur.bv());
+                       break;
+               }
 
+               switch (status_) {
 
-void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
-{
-       inset.deleteLyXText(bv, recursive);
-}
+               case Collapsed:
+                       lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
+                       edit(cur, true);
+                       cur.bv().cursor() = cur;
+                       break;
 
+               case Open: {
+                       if (hitButton(cmd)) {
+                               lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+                               setStatus(Collapsed);
+                               leaveInset(cur, *this);
+                               cur.bv().cursor() = cur;
+                       } else {
+                               lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
+                               InsetText::doDispatch(cur, cmd);
+                       }
+                       break;
+               }
 
-void InsetCollapsable::getLabelList(Buffer const & buffer,
-                                   std::vector<string> & list) const
-{
-       inset.getLabelList(buffer, list);
+               case Inlined:
+                       lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl;
+                       InsetText::doDispatch(cur, cmd);
+                       break;
+               }
+               break;
+
+       case LFUN_INSET_TOGGLE:
+               if (cmd.argument == "open")
+                       setStatus(Open);
+               else if (cmd.argument == "close") {
+                       setStatus(Collapsed);
+                       leaveInset(cur, *this);
+               } else if (cmd.argument == "toggle"
+                          || cmd.argument.empty()) {
+                       if (isOpen()) {
+                               setStatus(Collapsed);
+                               leaveInset(cur, *this);
+                       } else
+                               setStatus(Open);
+               } else // if assign or anything else
+                       cur.undispatched();
+               cur.dispatched();
+               break;
+
+       default:
+               InsetText::doDispatch(cur, cmd);
+               break;
+       }
 }
 
 
@@ -460,122 +370,51 @@ int InsetCollapsable::scroll(bool recursive) const
        int sx = UpdatableInset::scroll(false);
 
        if (recursive)
-               sx += inset.scroll(recursive);
+               sx += InsetText::scroll(false);
 
        return sx;
 }
 
 
-ParagraphList * InsetCollapsable::getParagraphs(int i) const
-{
-       return inset.getParagraphs(i);
-}
-
-
-int InsetCollapsable::numParagraphs() const
-{
-       return inset.numParagraphs();
-}
-
-
-LyXText * InsetCollapsable::getText(int i) const
-{
-       return inset.getText(i);
-}
-
-
-LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
-{
-       return inset.cursor(bv);
-}
-
-
-void InsetCollapsable::open(BufferView * bv)
+void InsetCollapsable::open()
 {
-       if (!collapsed_)
-               return;
-
-       collapsed_ = false;
-       bv->updateInset(this);
+       if (status_ == Collapsed)   // ...but not inlined
+               setStatus(Open);
 }
 
 
-void InsetCollapsable::close(BufferView * bv) const
+void InsetCollapsable::close()
 {
-       if (collapsed_)
-               return;
-
-       collapsed_ = true;
-       bv->updateInset(this);
+       setStatus(Collapsed);
 }
 
 
-void InsetCollapsable::setLabel(string const & l) const
+void InsetCollapsable::setLabel(string const & l)
 {
        label = l;
 }
 
 
-void InsetCollapsable::setCollapsed(bool c) const
-{
-       collapsed_ = c;
-}
-
-
-void InsetCollapsable::markErased()
-{
-       inset.markErased();
-}
-
-
-bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
-{
-       bool found = inset.nextChange(bv, length);
-
-       if (first_after_edit && !found)
-               close(bv);
-       else if (!found)
-               first_after_edit = false;
-       return found;
-}
-
-
-bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
-                                    bool cs, bool mw)
+void InsetCollapsable::setStatus(CollapseStatus status)
 {
-       bool found = inset.searchForward(bv, str, cs, mw);
-       if (first_after_edit && !found)
-               close(bv);
-       else if (!found)
-               first_after_edit = false;
-       return found;
+       status_ = status;
+       setButtonLabel();
 }
 
 
-bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
-                                     bool cs, bool mw)
+void InsetCollapsable::setLabelFont(LyXFont & font)
 {
-       bool found = inset.searchBackward(bv, str, cs, mw);
-       if (first_after_edit && !found)
-               close(bv);
-       else if (!found)
-               first_after_edit = false;
-       return found;
+       labelfont_ = font;
 }
 
 
-WordLangTuple const
-InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
+void InsetCollapsable::scroll(BufferView & bv, double sx) const
 {
-       WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
-       if (first_after_edit && word.word().empty())
-               close(bv);
-       first_after_edit = false;
-       return word;
+       UpdatableInset::scroll(bv, sx);
 }
 
 
-void InsetCollapsable::addPreview(PreviewLoader & loader) const
+void InsetCollapsable::scroll(BufferView & bv, int offset) const
 {
-       inset.addPreview(loader);
+       UpdatableInset::scroll(bv, offset);
 }