]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetcollapsable.C
split LyXFunc::getStatus() into inset specific chunks
[lyx.git] / src / insets / insetcollapsable.C
index 00b3e869ec6c3ce989ecb5b63d41ecf05bcfa110..0c8a5bef1b166d02abd3712134ca0a32047ec63c 100644 (file)
-/* This file is part of
- * ======================================================
+/**
+ * \file insetcollapsable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Alejandro Aguilar Sierra
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
- *          Copyright 1998-2001 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "insetcollapsable.h"
-#include "gettext.h"
-#include "lyxfont.h"
+
+#include "buffer.h"
 #include "BufferView.h"
-#include "frontends/Painter.h"
+#include "cursor.h"
 #include "debug.h"
-#include "lyxtext.h"
-#include "frontends/font_metrics.h"
+#include "dispatchresult.h"
+#include "LColor.h"
 #include "lyxlex.h"
+#include "funcrequest.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
 
-#include "insets/insettext.h"
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+#include "frontends/LyXView.h"
 
-#include "support/LOstream.h"
-#include "support/lstrings.h"
 
-using std::vector;
-using std::ostream;
+using lyx::graphics::PreviewLoader;
+
 using std::endl;
+using std::string;
 using std::max;
+using std::min;
+using std::ostream;
 
 
-class LyXText;
-
-
-InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
-       : UpdatableInset(), collapsed_(collapsed), inset(bp),
-         button_length(0), button_top_y(0), button_bottom_y(0),
-         need_update(NONE), label("Label"),
-#if 0
-       autocollapse(false),
-#endif
-         oldWidth(0), in_update(false), first_after_edit(false)
+InsetCollapsable::InsetCollapsable(BufferParams const & bp,
+       CollapseStatus status)
+       : inset(bp), label("Label"), status_(status), openinlined_(false)
 {
        inset.setOwner(this);
        inset.setAutoBreakRows(true);
-       inset.setDrawFrame(0, InsetText::ALWAYS);
-       inset.setFrameColor(0, LColor::collapsableframe);
+       inset.setDrawFrame(InsetText::ALWAYS);
+       inset.setFrameColor(LColor::collapsableframe);
        setInsetName("Collapsable");
+       setButtonLabel();
 }
 
 
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id)
-       : UpdatableInset(in, same_id), collapsed_(in.collapsed_),
-         framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
-         button_length(0), button_top_y(0), button_bottom_y(0),
-         need_update(NONE), label(in.label),
-#if 0
-         autocollapse(in.autocollapse),
-#endif
-         oldWidth(0), in_update(false), first_after_edit(false)
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
+       : UpdatableInset(in), inset(in.inset),
+         labelfont_(in.labelfont_), label(in.label), status_(in.status_)
 {
-       inset.init(&(in.inset), same_id);
        inset.setOwner(this);
+       setButtonLabel();
 }
 
 
-bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
+void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 {
-       if (!insetAllowed(in->lyxCode())) {
-               lyxerr << "InsetCollapsable::InsertInset: "
-                       "Unable to insert inset." << endl;
-               return false;
+       os << "status ";
+       switch (status_) {
+       case Open:
+               os << "open";
+               break;
+       case Collapsed:
+               os << "collapsed";
+               break;
+       case Inlined:
+               os << "inlined";
+               break;
        }
-       return inset.insertInset(bv, in);
-}
-
-
-void InsetCollapsable::write(Buffer const * buf, ostream & os) const
-{
-       os << "collapsed " << tostr(collapsed_) << "\n";
-       inset.writeParagraphData(buf, os);
+       os << "\n";
+       inset.text_.write(buf, os);
 }
 
 
-
-void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
+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);
-}
 
+       if (!token_found)
+               status_ = isOpen() ? Open : Collapsed;
 
-int InsetCollapsable::ascent_collapsed() const
-{
-       int width = 0;
-       int ascent = 0;
-       int descent = 0;
-       font_metrics::buttonText(label, labelfont, width, ascent, descent);
-       return ascent;
+       setButtonLabel();
 }
 
 
-int InsetCollapsable::descent_collapsed() const
+void InsetCollapsable::dimension_collapsed(Dimension & dim) const
 {
-       int width = 0;
-       int ascent = 0;
-       int descent = 0;
-       font_metrics::buttonText(label, labelfont, width, ascent, descent);
-       return descent;
+       font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
 }
 
 
-//int InsetCollapsable::width_collapsed(Painter & pain) const
-int InsetCollapsable::width_collapsed() const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       int width;
-       int ascent;
-       int descent;
-       font_metrics::buttonText(label, labelfont, width, ascent, descent);
-       return width + (2*TEXT_TO_INSET_OFFSET);
-}
-
-
-int InsetCollapsable::ascent(BufferView * /*bv*/, LyXFont const &) const
-{
-       return ascent_collapsed();
-}
-
-
-int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
-{
-       if (collapsed_)
-               return descent_collapsed();
-
-       return descent_collapsed()
-               + inset.descent(bv, font)
-               + inset.ascent(bv, font)
-               + TEXT_TO_BOTTOM_OFFSET;
-}
-
-
-int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
-{
-       if (collapsed_)
-               return width_collapsed();
-
-       int widthCollapsed = width_collapsed();
-
-       return (inset.width(bv, font) > widthCollapsed) ?
-               inset.width(bv, font) : widthCollapsed;
+       if (status_ == Inlined) {
+               inset.metrics(mi, dim);
+       } else {
+               dimension_collapsed(dim);
+               if (status_ == Open) {
+                       Dimension insetdim;
+                       inset.metrics(mi, insetdim);
+                       openinlined_ = (insetdim.wid + dim.wid <= mi.base.textwidth);
+                       if (openinlined_) {
+                               dim.wid += insetdim.wid;
+                               dim.des = max(dim.des, insetdim.des);
+                               dim.asc = max(dim.asc, insetdim.asc);
+                       } else {
+                               dim.des += insetdim.height()
+                                       + TEXT_TO_BOTTOM_OFFSET;
+                               dim.wid = max(dim.wid, insetdim.wid);
+                       }
+               }
+       }
+       dim_ = dim;
 }
 
 
-void InsetCollapsable::draw_collapsed(Painter & pain,
-                                     int baseline, float & x) const
+void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
 {
-       pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
-                       baseline, label, labelfont);
-       x += width_collapsed();
+       pi.pain.buttonText(x, y, label, labelfont_);
 }
 
 
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
-                           int baseline, float & x, bool cleared) const
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-       if (need_update != NONE) {
-               const_cast<InsetText *>(&inset)->update(bv, f, true);
-               bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
-               need_update = NONE;
-               return;
-       }
-       if (nodraw())
-               return;
-
-       Painter & pain = bv->painter();
-
-       button_length = width_collapsed();
-       button_top_y = -ascent(bv, f);
-       button_bottom_y = -ascent(bv, f) + ascent_collapsed() +
-               descent_collapsed();
-
-       if (!isOpen()) {
-               draw_collapsed(pain, baseline, x);
-               return;
-       }
-
-       float old_x = x;
-
-       if (!owner())
-               x += static_cast<float>(scroll());
-
-       if (!cleared && (inset.need_update == InsetText::FULL ||
-                        inset.need_update == InsetText::INIT ||
-                        top_x != int(x) ||
-                        top_baseline != baseline))
-       {
-               // we don't need anymore to clear here we just have to tell
-               // the underlying LyXText that it should do the RowClear!
-               inset.setUpdateStatus(bv, InsetText::FULL);
-               bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
-               return;
-       }
-
-       top_x = int(x);
-       topx_set = true;
-       top_baseline = baseline;
+       setPosCache(pi, x, y);
 
-       int const bl = baseline - ascent(bv, f) + ascent_collapsed();
-
-       draw_collapsed(pain, bl, old_x);
-       inset.draw(bv, f,
-                          bl + descent_collapsed() + inset.ascent(bv, f),
-                          x, cleared);
-       if (x < (top_x + button_length + TEXT_TO_INSET_OFFSET))
-               x = top_x + button_length + TEXT_TO_INSET_OFFSET;
-}
-
-
-void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
-                            mouse_button::state button)
-{
-       UpdatableInset::edit(bv, xp, yp, button);
-
-       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;
-               bv->updateInset(this, false);
-               inset.edit(bv);
+       if (status_ == Inlined) {
+               inset.draw(pi, x, y);
        } else {
-               if (!bv->lockInset(this))
-                       return;
-               if (yp <= button_bottom_y) {
-                       inset.edit(bv, xp, 0, button);
-               } else {
-                       LyXFont font(LyXFont::ALL_SANE);
-                       int yy = ascent(bv, font) + yp -
-                               (ascent_collapsed() +
-                                descent_collapsed() +
-                                inset.ascent(bv, font));
-                       inset.edit(bv, xp, yy, button);
+               Dimension dimc;
+               dimension_collapsed(dimc);
+               int const aa  = ascent();
+               button_dim.x1 = x + 0;
+               button_dim.x2 = x + dimc.width();
+               button_dim.y1 = y - aa + pi.base.bv->top_y();
+               button_dim.y2 = y - aa + pi.base.bv->top_y() + dimc.height();
+
+               draw_collapsed(pi, x, y);
+               if (status_ == Open) {
+                       if (!owner())
+                               x += scroll();
+                       
+                       if (openinlined_)
+                               inset.draw(pi, x + dimc.width(), y - aa + inset.ascent());
+                       else 
+                               inset.draw(pi, x, y - aa + dimc.height() + inset.ascent());
                }
        }
 }
 
 
-void InsetCollapsable::edit(BufferView * bv, bool front)
+void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
-       UpdatableInset::edit(bv, front);
-
-       if (collapsed_) {
-               collapsed_ = false;
-               if (!bv->lockInset(this))
-                       return;
-               inset.setUpdateStatus(bv, InsetText::FULL);
-               bv->updateInset(this, false);
-               inset.edit(bv, front);
-               first_after_edit = true;
-       } else {
-               if (!bv->lockInset(this))
-                       return;
-               inset.edit(bv, front);
-       }
+       inset.drawSelection(pi, x, y);
 }
 
 
-Inset::EDITABLE InsetCollapsable::editable() const
+InsetOld::EDITABLE InsetCollapsable::editable() const
 {
-       if (collapsed_)
-               return IS_EDITABLE;
-       return HIGHLY_EDITABLE;
+       return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
-void InsetCollapsable::insetUnlock(BufferView * bv)
+bool InsetCollapsable::descendable() const
 {
-#if 0
-       if (autocollapse) {
-               if (change_label_with_text) {
-                       draw_label = get_new_label();
-               } else {
-                       draw_label = label;
-               }
-               collapsed_ = true;
-       }
-#endif
-       inset.insetUnlock(bv);
-       if (scroll())
-               scroll(bv, 0.0F);
-       bv->updateInset(this, false);
+       return status_ != Collapsed;
 }
 
 
-void InsetCollapsable::insetButtonPress(BufferView * bv,
-       int x, int y, mouse_button::state button)
+void InsetCollapsable::lfunMouseRelease(LCursor & cur, FuncRequest & cmd)
 {
-       if (!collapsed_ && (y > button_bottom_y)) {
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + y -
-                   (ascent_collapsed() +
-                    descent_collapsed() +
-                    inset.ascent(bv, font));
-               inset.insetButtonPress(bv, x, yy, button);
+       if (cmd.button() == mouse_button::button3) {
+               showInsetDialog(&cur.bv());
+               return;
        }
-}
-
 
-bool InsetCollapsable::insetButtonRelease(BufferView * bv,
-       int x, int y, mouse_button::state button)
-{
-       bool ret = false;
-       if ((button != mouse_button::button3) && (x < button_length) &&
-           (y >= button_top_y) &&  (y <= button_bottom_y))
-       {
-               if (collapsed_) {
-                       collapsed_ = false;
-// should not be called on inset open!
-//                     inset.insetButtonRelease(bv, 0, 0, button);
-                       inset.setUpdateStatus(bv, InsetText::FULL);
-                       bv->updateInset(this, false);
-               } else {
-                       collapsed_ = true;
-                       bv->unlockInset(this);
-                       bv->updateInset(this, false);
+       switch (status_) {
+
+       case Collapsed:
+               lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
+               setStatus(Open);
+               edit(cur, true);
+               break;
+
+       case Open: {
+               FuncRequest cmd1 = cmd;
+               if (hitButton(cmd1)) {
+                       lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+                       setStatus(Collapsed);
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+                       break;
                }
-       } else if (!collapsed_ && (y > button_bottom_y)) {
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + y -
-                   (ascent_collapsed() +
-                    descent_collapsed() +
-                    inset.ascent(bv, font));
-               ret = inset.insetButtonRelease(bv, x, yy, button);
-       }
-       if ((button == mouse_button::button3) && !ret) {
-               return showInsetDialog(bv);
+               lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
+               inset.dispatch(cur, cmd);
+               break;
        }
-       return ret;
-}
-
 
-void InsetCollapsable::insetMotionNotify(BufferView * bv,
-       int x, int y, mouse_button::state state)
-{
-       if (y > button_bottom_y) {
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + y -
-                   (ascent_collapsed() +
-                    descent_collapsed() +
-                    inset.ascent(bv, font));
-               inset.insetMotionNotify(bv, x, yy, state);
+       case Inlined:
+               inset.dispatch(cur, cmd);
+               break;
        }
 }
 
 
-int InsetCollapsable::latex(Buffer const * buf, ostream & os,
-                           bool fragile, bool free_spc) const
+int InsetCollapsable::latex(Buffer const & buf, ostream & os,
+                           OutputParams const & runparams) const
 {
-       return inset.latex(buf, os, fragile, free_spc);
+       return inset.latex(buf, os, runparams);
 }
 
 
-int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
+int InsetCollapsable::plaintext(Buffer const & buf, ostream & os,
+                           OutputParams const & runparams) const
 {
-       return inset.ascii(buf, os, ll);
+       return inset.plaintext(buf, os, runparams);
 }
 
 
-int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
+int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os,
+                              OutputParams const & runparams) const
 {
-       return inset.linuxdoc(buf, os);
+       return inset.linuxdoc(buf, os, runparams);
 }
 
 
-int InsetCollapsable::docbook(Buffer const * buf, ostream & os) const
+int InsetCollapsable::docbook(Buffer const & buf, ostream & os,
+                             OutputParams const & runparams) const
 {
-       return inset.docbook(buf, os);
+       return inset.docbook(buf, os, runparams);
 }
 
-#if 0
-int InsetCollapsable::getMaxWidth(BufferView * bv,
-                                 UpdatableInset const * in) const
-{
-#if 0
-       int const w = UpdatableInset::getMaxWidth(bv, in);
 
-       if (w < 0) {
-               // What does a negative max width signify? (Lgb)
-               // Use the max width of the draw-area (Jug)
-               return w;
-       }
-       // should be at least 30 pixels !!!
-       return max(30, w - width_collapsed());
-#else
-       return UpdatableInset::getMaxWidth(bv, in);
-#endif
+bool InsetCollapsable::hitButton(FuncRequest & cmd) const
+{
+       return button_dim.contains(cmd.x, cmd.y);
 }
-#endif
 
 
-void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
-                             bool reinit)
+string const InsetCollapsable::getNewLabel(string const & l) const
 {
-       if (in_update) {
-               if (reinit && owner()) {
-                       owner()->update(bv, font, true);
-               }
-               return;
+       string label;
+       pos_type const max_length = 15;
+       pos_type const p_siz = inset.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 (inset.paragraphs().begin()->isInset(j))
+                       continue;
+               label += inset.paragraphs().begin()->getChar(j);
+               ++i;
        }
-       in_update = true;
-       inset.update(bv, font, reinit);
-       if (reinit && owner()) {
-               owner()->update(bv, font, true);
+       if (inset.paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
+               label += "...";
        }
-       in_update = false;
-}
-
-
-UpdatableInset::RESULT
-InsetCollapsable::localDispatch(BufferView * bv, kb_action action,
-                               string const & arg)
-{
-       UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
-       if (result >= FINISHED)
-               bv->unlockInset(this);
-       first_after_edit = false;
-       return result;
+       return label.empty() ? l : label;
 }
 
 
-bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
+void InsetCollapsable::edit(LCursor & cur, bool left)
 {
-       if (&inset == in)
-               return true;
-       return inset.lockInsetInInset(bv, in);
+       //lyxerr << "InsetCollapsable: edit left/right" << endl;
+       cur.push(*this);
+       inset.edit(cur, left);
+       open();
 }
 
 
-bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
-                                         bool lr)
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 {
-       if (&inset == in) {
-               bv->unlockInset(this);
-               return true;
+       cur.push(*this);
+       //lyxerr << "InsetCollapsable: edit xy" << endl;
+       if (status_ == Collapsed) {
+               setStatus(Open);
+               inset.edit(cur, true);
+#warning look here
+//we are not calling edit(x,y) because there are no coordinates in the
+//inset yet. I personally think it's ok. (ab)
+               return this;
+       }
+       return inset.editXY(cur, x, y);
+}
+
+
+void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+{
+       //lyxerr << "\nInsetCollapsable::priv_dispatch (begin): cmd: " << cmd
+       //      << "  button y: " << button_dim.y2 << endl;
+       switch (cmd.action) {
+               case LFUN_MOUSE_PRESS:
+                       if (status_ == Inlined)
+                               inset.dispatch(cur, cmd);
+                       else if (status_ == Open && !hitButton(cmd))
+                               inset.dispatch(cur, cmd);
+                       break;
+
+               case LFUN_MOUSE_MOTION:
+                       if (status_ == Inlined)
+                               inset.dispatch(cur, cmd);
+                       else if (status_ == Open && !hitButton(cmd))
+                               inset.dispatch(cur, cmd);
+                       break;
+
+               case LFUN_MOUSE_RELEASE:
+                       lfunMouseRelease(cur, cmd);
+                       break;
+
+               case LFUN_INSET_TOGGLE:
+                       if (inset.text_.toggleInset(cur))
+                               break;
+                       if (status_ == Open) {
+                               setStatus(Inlined);
+                               break;
+                       }
+                       setStatus(Collapsed);
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+                       break;
+
+               default:
+                       inset.dispatch(cur, cmd);
+                       break;
        }
-       return inset.unlockInsetInInset(bv, in, lr);
-}
-
-
-bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
-{
-       if (in == this)
-               return true;
-       return inset.updateInsetInInset(bv, in);
 }
 
 
-int InsetCollapsable::insetInInsetY() const
+bool InsetCollapsable::getStatus(LCursor & cur, FuncRequest const & cmd,
+       FuncStatus & flag) const
 {
-       return inset.insetInInsetY() - (top_baseline - inset.y());
+       return inset.getStatus(cur, cmd, flag);
 }
 
 
@@ -487,190 +374,113 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
+void InsetCollapsable::getCursorPos(CursorSlice const & cur,
+       int & x, int & y) const
 {
-       inset.getCursorPos(bv, x , y);
+       inset.getCursorPos(cur, x, y);
 }
 
 
-void InsetCollapsable::toggleInsetCursor(BufferView * bv)
+void InsetCollapsable::getLabelList(Buffer const & buffer,
+                                   std::vector<string> & list) const
 {
-       inset.toggleInsetCursor(bv);
+       inset.getLabelList(buffer, list);
 }
 
 
-void InsetCollapsable::showInsetCursor(BufferView * bv, bool show)
-{
-       inset.showInsetCursor(bv, show);
-}
-
-
-void InsetCollapsable::hideInsetCursor(BufferView * bv)
-{
-       inset.hideInsetCursor(bv);
-}
-
-
-UpdatableInset * InsetCollapsable::getLockingInset() const
-{
-       UpdatableInset * in = inset.getLockingInset();
-       if (const_cast<InsetText *>(&inset) == in)
-               return const_cast<InsetCollapsable *>(this);
-       return in;
-}
-
-
-UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(Inset::Code c)
-{
-       if (c == lyxCode())
-               return this;
-       return inset.getFirstLockingInsetOfType(c);
-}
-
-
-void InsetCollapsable::setFont(BufferView * bv, LyXFont const & font,
-                              bool toggleall, bool selectall)
-{
-       inset.setFont(bv, font, toggleall, selectall);
-}
-
-
-bool InsetCollapsable::doClearArea() const
-{
-       return inset.doClearArea();
-}
-
-
-LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
-                                      bool const recursive) const
-{
-       return inset.getLyXText(bv, recursive);
-}
-
-
-void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
+int InsetCollapsable::scroll(bool recursive) const
 {
-       inset.deleteLyXText(bv, recursive);
-}
+       int sx = UpdatableInset::scroll(false);
 
+       if (recursive)
+               sx += inset.scroll(false);
 
-void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const
-{
-       inset.resizeLyXText(bv, force);
-       LyXFont font(LyXFont::ALL_SANE);
-       oldWidth = width(bv, font);
+       return sx;
 }
 
 
-vector<string> const InsetCollapsable::getLabelList() const
+size_t InsetCollapsable::nargs() const
 {
-       return inset.getLabelList();
+       return inset.nargs();
 }
 
 
-bool InsetCollapsable::nodraw() const
+LyXText * InsetCollapsable::getText(int i) const
 {
-       return inset.nodraw();
+       return inset.getText(i);
 }
 
 
-int InsetCollapsable::scroll(bool recursive) const
+void InsetCollapsable::open()
 {
-       int sx = UpdatableInset::scroll(false);
-
-       if (recursive)
-               sx += inset.scroll(recursive);
-
-       return sx;
+       if (status_ == Collapsed)   // ...but not inlined
+               setStatus(Open);
 }
 
 
-Paragraph * InsetCollapsable::getParFromID(int id) const
+void InsetCollapsable::close()
 {
-       lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
-       return inset.getParFromID(id);
+       setStatus(Collapsed);
 }
 
 
-Paragraph * InsetCollapsable::firstParagraph() const
+void InsetCollapsable::setLabel(string const & l)
 {
-       return inset.firstParagraph();
+       label = l;
 }
 
 
-Paragraph * InsetCollapsable::getFirstParagraph(int i) const
+void InsetCollapsable::setStatus(CollapseStatus st)
 {
-       return inset.getFirstParagraph(i);
+       status_ = st;
+       setButtonLabel();
 }
 
 
-LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
+void InsetCollapsable::markErased()
 {
-       return inset.cursor(bv);
+       inset.markErased();
 }
 
 
-Inset * InsetCollapsable::getInsetFromID(int id_arg) const
+void InsetCollapsable::addPreview(PreviewLoader & loader) const
 {
-       if (id_arg == id())
-               return const_cast<InsetCollapsable *>(this);
-       return inset.getInsetFromID(id_arg);
+       inset.addPreview(loader);
 }
 
 
-void InsetCollapsable::open(BufferView * bv)
+bool InsetCollapsable::insetAllowed(InsetOld::Code code) const
 {
-       if (!collapsed_) return;
-
-       collapsed_ = false;
-       bv->updateInset(this, false);
+       return inset.insetAllowed(code);
 }
 
 
-void InsetCollapsable::close(BufferView * bv) const
+void InsetCollapsable::setLabelFont(LyXFont & font)
 {
-       if (collapsed_)
-               return;
-
-       collapsed_ = true;
-       bv->updateInset(const_cast<InsetCollapsable *>(this), false);
+       labelfont_ = font;
 }
 
 
-void InsetCollapsable::setLabel(string const & l) const
+void InsetCollapsable::scroll(BufferView & bv, float sx) const
 {
-       label = l;
+       UpdatableInset::scroll(bv, sx);
 }
 
 
-bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
-                                    bool cs, bool mw)
+void InsetCollapsable::scroll(BufferView & bv, int offset) const
 {
-       bool found = inset.searchForward(bv, str, cs, mw);
-       if (first_after_edit && !found)
-               close(bv);
-       first_after_edit = false;
-       return found;
+       UpdatableInset::scroll(bv, offset);
 }
 
 
-bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
-                                     bool cs, bool mw)
+Box const & InsetCollapsable::buttonDim() const
 {
-       bool found = inset.searchBackward(bv, str, cs, mw);
-       if (first_after_edit && !found)
-               close(bv);
-       first_after_edit = false;
-       return found;
+       return button_dim;
 }
 
 
-string const InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv,
-                                             float & value) const
+void InsetCollapsable::setBackgroundColor(LColor_color color)
 {
-       string const str = inset.selectNextWordToSpellcheck(bv, value);
-       if (first_after_edit && str.empty())
-               close(bv);
-       first_after_edit = false;
-       return str;
+       InsetOld::setBackgroundColor(color);
+       inset.setBackgroundColor(color);
 }