]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetcollapsable.C
fix #832
[lyx.git] / src / insets / insetcollapsable.C
index 2802e0507d64b53bb3ed1dbdeac1b054aa4fd37e..ea684568d03b06aedd2680d111fe71c68e19649f 100644 (file)
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *          Copyright 1998-2001 The LyX Team.
+/**
+ * \file insetcollapsable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Alejandro Aguilar Sierra
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ *
+ * 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 "insettext.h"
+
 #include "BufferView.h"
-#include "Painter.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
 #include "debug.h"
+#include "gettext.h"
+#include "lyxfont.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
+#include "WordLangTuple.h"
+#include "funcrequest.h"
+#include "buffer.h"
+
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+#include "frontends/LyXView.h"
 
-class LyXText;
+#include "support/LAssert.h"
+#include "support/LOstream.h"
 
+using std::vector;
 using std::ostream;
 using std::endl;
 using std::max;
 
-InsetCollapsable::InsetCollapsable()
-       : UpdatableInset(), inset(new InsetText)
+
+InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
+       : UpdatableInset(), collapsed_(collapsed), inset(bp),
+         button_length(0), button_top_y(0), button_bottom_y(0),
+         label("Label"),
+#if 0
+       autocollapse(false),
+#endif
+         oldWidth(0), in_update(false), first_after_edit(false)
 {
-       //inset = new InsetText;
-    inset->setOwner(this);
-    collapsed = false;
-    label = "Label";
-    autocollapse = true;
-    inset->SetAutoBreakRows(true);
-    inset->SetDrawFrame(0, InsetText::ALWAYS);
-    inset->SetFrameColor(0, LColor::footnoteframe);
-    button_length = button_top_y = button_bottom_y = 0;
-    setInsetName("Collapsable");
-    widthCollapsed = oldWidth = 0;
-    need_update = FULL;
+       inset.setOwner(this);
+       inset.setAutoBreakRows(true);
+       inset.setDrawFrame(0, InsetText::ALWAYS);
+       inset.setFrameColor(0, LColor::collapsableframe);
+       setInsetName("Collapsable");
 }
 
 
-Inset * InsetCollapsable::Clone(Buffer const &) const
+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),
+         label(in.label),
+#if 0
+         autocollapse(in.autocollapse),
+#endif
+         oldWidth(0), in_update(false), first_after_edit(false)
 {
-    InsetCollapsable * result = new InsetCollapsable();
-    result->inset->init(inset);
-    result->inset->setOwner(result);
-
-    result->collapsed = collapsed;
-    return result;
+       inset.init(&(in.inset), same_id);
+       inset.setOwner(this);
 }
 
 
-bool InsetCollapsable::InsertInset(BufferView * bv, Inset * in)
+bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
 {
-    if (!InsertInsetAllowed(in)) {
-       lyxerr << "InsetCollapsable::InsertInset: "
-               "Unable to insert inset." << endl;
-       return false;
-    }
-    
-    return inset->InsertInset(bv, in);
+       if (!insetAllowed(in->lyxCode())) {
+               lyxerr << "InsetCollapsable::InsertInset: "
+                       "Unable to insert inset." << endl;
+               return false;
+       }
+       return inset.insertInset(bv, in);
 }
 
 
-void InsetCollapsable::Write(Buffer const * buf, ostream & os) const
+void InsetCollapsable::write(Buffer const * buf, ostream & os) const
 {
-    os << "collapsed " << tostr(collapsed) << "\n";
-    inset->WriteParagraphData(buf, os);
+       os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
+       inset.writeParagraphData(buf, os);
 }
 
 
 
-void InsetCollapsable::Read(Buffer const * buf, LyXLex & lex)
+void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
 {
-    if (lex.IsOK()) {
-       lex.next();
-        string const token = lex.GetString();
-       if (token == "collapsed") {
-           lex.next();
-           collapsed = lex.GetBool();
-       } else {
-               lyxerr << "InsetCollapsable::Read: Missing collapsed!"
-                      << endl;
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token == "collapsed") {
+                       lex.next();
+                       collapsed_ = lex.getBool();
+               } else {
+                       lyxerr << "InsetCollapsable::Read: Missing collapsed!"
+                              << endl;
+                       // Take countermeasures
+                       lex.pushToken(token);
+               }
        }
-    }
-    inset->Read(buf, lex);
+       inset.read(buf, lex);
 }
 
 
-int InsetCollapsable::ascent_collapsed(Painter & pain, LyXFont const &) const
+int InsetCollapsable::ascent_collapsed() const
 {
-    int width = 0;
-    int ascent = 0;
-    int descent = 0;
-    pain.buttonText(0, 0, label, labelfont, false, 
-                   width, ascent, descent);
-    return ascent;
+       int width = 0;
+       int ascent = 0;
+       int descent = 0;
+       font_metrics::buttonText(label, labelfont, width, ascent, descent);
+       return ascent;
 }
 
 
-int InsetCollapsable::descent_collapsed(Painter & pain, LyXFont const &) const
+int InsetCollapsable::descent_collapsed() const
 {
-    int width = 0;
-    int ascent = 0;
-    int descent = 0;
-    pain.buttonText(0, 0, label, labelfont, false, 
-                   width, ascent, descent);
-    return descent;
+       int width = 0;
+       int ascent = 0;
+       int descent = 0;
+       font_metrics::buttonText(label, labelfont, width, ascent, descent);
+       return descent;
 }
 
 
-int InsetCollapsable::width_collapsed(Painter & pain, LyXFont const &) const
+//int InsetCollapsable::width_collapsed(Painter & pain) const
+int InsetCollapsable::width_collapsed() const
 {
-    int width;
-    int ascent;
-    int descent;
-    pain.buttonText(TEXT_TO_INSET_OFFSET, 0, label, labelfont, false,
-                   width, ascent, descent);
-    return width + (2*TEXT_TO_INSET_OFFSET);
+       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 & font) const
+int InsetCollapsable::ascent(BufferView * /*bv*/, LyXFont const &) const
 {
-    if (collapsed) 
-       return ascent_collapsed(bv->painter(), font);
-    else 
-       return inset->ascent(bv, font) + TEXT_TO_TOP_OFFSET;
+       return ascent_collapsed();
 }
 
 
 int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
 {
-    if (collapsed) 
-       return descent_collapsed(bv->painter(), font);
-    else 
-       return inset->descent(bv, font) + TEXT_TO_BOTTOM_OFFSET;
+       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 widthCollapsed;
+       if (collapsed_)
+               return width_collapsed();
 
-    return inset->width(bv, font) + widthCollapsed;
+       int const collapsed_width = width_collapsed();
+       int const contents_width = inset.width(bv, font);
+
+       return max(collapsed_width, contents_width);
 }
 
 
-void InsetCollapsable::draw_collapsed(Painter & pain, LyXFont const &,
+void InsetCollapsable::draw_collapsed(Painter & pain,
                                      int baseline, float & x) const
 {
-    int width = 0;
-    pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
-                   baseline, label, labelfont, true, width);
-    x += width + TEXT_TO_INSET_OFFSET;
+       pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
+                       baseline, label, labelfont);
+       x += width_collapsed();
 }
 
 
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, 
-                           int baseline, float & x, bool cleared) const
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
+                            int baseline, float & x, bool inlined) const
 {
-    Painter & pain = bv->painter();
+       lyx::Assert(bv);
+       cache(bv);
 
-    button_length = widthCollapsed;
-    button_top_y = -ascent_collapsed(pain, f);
-    button_bottom_y = descent_collapsed(pain, f);
-    if (collapsed) {
-       draw_collapsed(pain, f, baseline, x);
-       x += TEXT_TO_INSET_OFFSET;
-       return;
-    }
+       if (nodraw())
+               return;
 
-    if (!cleared && ((inset->need_update == InsetText::FULL) ||
-                    (inset->need_update == InsetText::INIT) ||
-                    (top_x != int(x)) || (top_baseline != baseline))) {
-       int w =  owner() ? width(bv, f) : pain.paperWidth();
-       int h = ascent(bv, f) + descent(bv, f);
-       int tx = (needFullRow() && !owner()) ? 0 : int(x);
-       int ty = max(0, baseline - ascent(bv, f));
-       
-       if ((ty + h) > pain.paperHeight())
-           h = pain.paperHeight();
-       if ((top_x + w) > pain.paperWidth())
-           w = pain.paperWidth();
-       if (baseline < 0)
-           h += (baseline - ascent(bv, f));
-       pain.fillRectangle(tx, ty - 1, w, h + 2);
-       cleared = true;
-    }
+       Painter & pain = bv->painter();
 
-    top_x = int(x);
-    top_baseline = baseline;
+       button_length = width_collapsed();
+       button_top_y = -ascent(bv, f);
+       button_bottom_y = -ascent(bv, f) + ascent_collapsed() +
+               descent_collapsed();
 
-    draw_collapsed(pain, f,
-                  baseline - ascent(bv, f) + ascent_collapsed(pain, f),
-                  x);
-    inset->draw(bv, f, 
-               baseline - ascent(bv, f) + ascent_collapsed(pain, f),
-               x, cleared);
-    need_update = NONE;
+       if (!isOpen()) {
+               draw_collapsed(pain, baseline, x);
+               return;
+       }
+
+       float old_x = x;
+
+       if (!owner())
+               x += scroll();
+
+       top_x = int(x);
+       top_baseline = baseline;
+
+       int const bl = baseline - ascent(bv, f) + ascent_collapsed();
+
+       if (inlined) {
+               inset.draw(bv, f, baseline, x);
+       } else {
+               draw_collapsed(pain, bl, old_x);
+               inset.draw(bv, f, bl + descent_collapsed() + inset.ascent(bv, f), x);
+               // contained inset may be shorter than the button
+               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 x, int y, unsigned int button)
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
+                           int baseline, float & x) const
 {
-    UpdatableInset::Edit(bv, x, y, button);
-
-    if (collapsed && autocollapse) {
-       collapsed = false;
-       if (!bv->lockInset(this))
-           return;
-       bv->updateInset(this, false);
-       inset->Edit(bv, 0, 0, button);
-    } else if (!collapsed) {
-       if (!bv->lockInset(this))
-           return;
-       inset->Edit(bv, x - widthCollapsed, y, button);
-    }
+       // by default, we are not inlined-drawing
+       draw(bv, f, baseline, x, false);
 }
 
 
-Inset::EDITABLE InsetCollapsable::Editable() const
+Inset::EDITABLE InsetCollapsable::editable() const
 {
-       if (collapsed)
-               return IS_EDITABLE;
-       return HIGHLY_EDITABLE;
+       return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
 }
 
 
-void InsetCollapsable::InsetUnlock(BufferView * bv)
+void InsetCollapsable::insetUnlock(BufferView * bv)
 {
-    if (autocollapse) {
-       collapsed = true;
-    }
-    inset->InsetUnlock(bv);
-    bv->updateInset(this, false);
+#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);
 }
 
 
-void InsetCollapsable::InsetButtonPress(BufferView * bv,int x,int y,int button)
+FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
 {
-    if (!collapsed && (x >= button_length)) {
-       inset->InsetButtonPress(bv, x - widthCollapsed, y, button);
-    }
+       LyXFont font(LyXFont::ALL_SANE);
+       FuncRequest cmd1 = cmd;
+       cmd1.y = ascent(cmd.view(), font) + cmd.y -
+           (ascent_collapsed() +
+            descent_collapsed() +
+            inset.ascent(cmd.view(), font));
+       return cmd1;
 }
 
 
-void InsetCollapsable::InsetButtonRelease(BufferView * bv,
-                                         int x, int y, int button)
+void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
 {
-    if ((x >= 0)  && (x < button_length) &&
-       (y >= button_top_y) &&  (y < button_bottom_y)) {
-       if (collapsed) {
-           collapsed = false;
-           inset->InsetButtonRelease(bv, 0, 0, button);
-           bv->updateInset(this, false);
-       } else {
-           collapsed = true;
-           bv->unlockInset(this);
-           bv->updateInset(this, false);
+       bool ret = false;
+       BufferView * bv = cmd.view();
+
+       if (collapsed_ && cmd.button() != mouse_button::button3) {
+               collapsed_ = false;
+               inset.setUpdateStatus(bv, InsetText::FULL);
+               bv->updateInset(this);
+               bv->buffer()->markDirty();
+               return;
        }
-    } else if (!collapsed && (x >= button_length) && (y >= button_top_y)) {
-       inset->InsetButtonRelease(bv, x - widthCollapsed, y, button);
-    }
+
+       if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
+           (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y))
+       {
+               if (collapsed_) {
+                       collapsed_ = false;
+                       inset.setUpdateStatus(bv, InsetText::FULL);
+                       bv->updateInset(this);
+                       bv->buffer()->markDirty();
+               } else {
+                       collapsed_ = true;
+                       bv->unlockInset(this);
+                       bv->updateInset(this);
+                       bv->buffer()->markDirty();
+               }
+       } else if (!collapsed_ && (cmd.y > button_bottom_y)) {
+               ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
+       }
+       if (cmd.button() == mouse_button::button3 && !ret)
+               showInsetDialog(bv);
 }
 
 
-void InsetCollapsable::InsetMotionNotify(BufferView * bv,
-                                        int x, int y, int state)
+int InsetCollapsable::latex(Buffer const * buf, ostream & os,
+                           bool fragile, bool free_spc) const
 {
-    if (x >= button_length) {
-       inset->InsetMotionNotify(bv, x-widthCollapsed, y, state);
-    }
+       return inset.latex(buf, os, fragile, free_spc);
 }
 
 
-void InsetCollapsable::InsetKeyPress(XKeyEvent * xke)
+int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
 {
-    inset->InsetKeyPress(xke);
+       return inset.ascii(buf, os, ll);
 }
 
 
-int InsetCollapsable::Latex(Buffer const * buf, ostream & os,
-                           bool fragile, bool free_spc) const
+int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
 {
-    return inset->Latex(buf, os, fragile, free_spc);
+       return inset.linuxdoc(buf, os);
 }
 
 
-int InsetCollapsable::getMaxWidth(Painter & pain,
-                                 UpdatableInset const * inset) const
+int InsetCollapsable::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 {
-    int const w = UpdatableInset::getMaxWidth(pain, inset);
+       return inset.docbook(buf, os, mixcont);
+}
 
-    if (w < 0) {
-       // What does a negative max width signify? (Lgb)
-       return w;
-    }
-    // should be at least 30 pixels !!!
-    return max(30, w - widthCollapsed);
+
+void InsetCollapsable::update(BufferView * bv, bool reinit)
+{
+       if (in_update) {
+               if (reinit && owner()) {
+                       owner()->update(bv, true);
+               }
+               return;
+       }
+       in_update = true;
+       inset.update(bv, reinit);
+       if (reinit && owner()) {
+               owner()->update(bv, true);
+       }
+       in_update = false;
+}
+
+
+Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+{
+       //lyxerr << "InsetCollapsable::localDispatch: " << cmd.action << "\n";
+       BufferView * bv = cmd.view();
+       switch (cmd.action) {
+               case LFUN_INSET_EDIT: {
+                       if (!cmd.argument.empty()) {
+                               UpdatableInset::localDispatch(cmd);
+                               if (collapsed_) {
+                                       collapsed_ = false;
+                                       if (bv->lockInset(this)) {
+                                               inset.setUpdateStatus(bv, InsetText::FULL);
+                                               bv->updateInset(this);
+                                               bv->buffer()->markDirty();
+                                               inset.localDispatch(cmd);
+                                               first_after_edit = true;
+                                       }
+                               } else {
+                                       if (bv->lockInset(this))
+                                               inset.localDispatch(cmd);
+                               }
+                               return DISPATCHED;
+                       }
+
+#ifdef WITH_WARNINGS
+#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
+#endif
+                       if (cmd.button() == mouse_button::button3)
+                               return DISPATCHED;
+
+                       UpdatableInset::localDispatch(cmd);
+
+                       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 DISPATCHED;
+                               bv->updateInset(this);
+                               bv->buffer()->markDirty();
+                               inset.localDispatch(cmd);
+                       } else {
+                               FuncRequest cmd1 = cmd;
+                               if (!bv->lockInset(this))
+                                       return DISPATCHED;
+                               if (cmd.y <= button_bottom_y) {
+                                       cmd1.y = 0;
+                               } else {
+                                       LyXFont font(LyXFont::ALL_SANE);
+                                       cmd1.y = ascent(bv, font) + cmd.y -
+                                               (ascent_collapsed() +
+                                               descent_collapsed() +
+                                               inset.ascent(bv, font));
+                               }
+                               inset.localDispatch(cmd);
+                       }
+                       return DISPATCHED;
+               }
+
+               case LFUN_MOUSE_PRESS:
+                       if (!collapsed_ && cmd.y > button_bottom_y)
+                               inset.localDispatch(adjustCommand(cmd));
+                       return DISPATCHED;
+
+               case LFUN_MOUSE_MOTION:
+                       if (!collapsed_ && cmd.y > button_bottom_y)
+                               inset.localDispatch(adjustCommand(cmd));
+                       return DISPATCHED;
+
+               case LFUN_MOUSE_RELEASE:
+                       lfunMouseRelease(cmd);
+                       return DISPATCHED;
+
+               default:
+                       UpdatableInset::RESULT result = inset.localDispatch(cmd);
+                       if (result >= FINISHED)
+                               bv->unlockInset(this);
+                       first_after_edit = false;
+                       return result;
+       }
 }
 
 
-#if 0
-int InsetCollapsable::getMaxTextWidth(Painter & pain,
-                                     UpdatableInset const * inset) const
+bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
 {
-    return getMaxWidth(pain, inset) - widthCollapsed;
+       if (&inset == in)
+               return true;
+       return inset.lockInsetInInset(bv, in);
 }
-#endif
 
 
-void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
-                             bool reinit)
-{
-    if (reinit) {
-       need_update = FULL;
-       if (owner())
-           owner()->update(bv, font, true);
-       return;
-    }
-    if (!widthCollapsed) {
-       widthCollapsed = width_collapsed(bv->painter(), font);
-       inset->resizeLyXText(bv);
-       need_update = FULL;
-       if (owner()) {
-               owner()->update(bv, font);
-               return;
+bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
+                                         bool lr)
+{
+       if (&inset == in) {
+               bv->unlockInset(this);
+               return true;
        }
-    }
-    if (oldWidth != width(bv, font)) {
+       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
+{
+       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);
+}
+
+
+void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
+{
+       inset.getCursorPos(bv, x , y);
+}
+
+
+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);
+}
+
+
+LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
+                                      bool const recursive) const
+{
+       return inset.getLyXText(bv, recursive);
+}
+
+
+void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
+{
+       inset.deleteLyXText(bv, recursive);
+}
+
+
+void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const
+{
+       inset.resizeLyXText(bv, force);
+       LyXFont font(LyXFont::ALL_SANE);
        oldWidth = width(bv, font);
-       inset->resizeLyXText(bv);
-       need_update = FULL;
-       if (owner()) {
-               owner()->update(bv, font);
-               return;
-       }
-    }
-    inset->update(bv, font);
 }
 
 
-UpdatableInset::RESULT
-InsetCollapsable::LocalDispatch(BufferView * bv, kb_action action,
-                               string const & arg)
+vector<string> const InsetCollapsable::getLabelList() const
 {
-    UpdatableInset::RESULT result = inset->LocalDispatch(bv, action, arg);
-    if (result == FINISHED)
-        bv->unlockInset(this);
-    return result;
+       return inset.getLabelList();
 }
 
 
-bool InsetCollapsable::LockInsetInInset(BufferView * bv, UpdatableInset * in)
+bool InsetCollapsable::nodraw() const
 {
-    if (inset == in)
-       return true;
-    return inset->LockInsetInInset(bv, in);
+       return inset.nodraw();
 }
 
 
-bool InsetCollapsable::UnlockInsetInInset(BufferView * bv, UpdatableInset * in,
-                                         bool lr)
+int InsetCollapsable::scroll(bool recursive) const
+{
+       int sx = UpdatableInset::scroll(false);
+
+       if (recursive)
+               sx += inset.scroll(recursive);
+
+       return sx;
+}
+
+
+ParagraphList * InsetCollapsable::getParagraphs(int i) const
 {
-    if (inset == in) {
-       bv->unlockInset(this);
-       return true;
-    }
-    return inset->UnlockInsetInInset(bv, in, lr);
+       return inset.getParagraphs(i);
 }
 
 
-bool InsetCollapsable::UpdateInsetInInset(BufferView * bv, Inset *in)
+LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
 {
-    if (in == inset)
-       return true;
-    return inset->UpdateInsetInInset(bv, in);
+       return inset.cursor(bv);
 }
 
 
-unsigned int InsetCollapsable::InsetInInsetY()
+Inset * InsetCollapsable::getInsetFromID(int id_arg) const
 {
-    return inset->InsetInInsetY() - (top_baseline - inset->y());
+       if (id_arg == id())
+               return const_cast<InsetCollapsable *>(this);
+       return inset.getInsetFromID(id_arg);
 }
 
 
-void InsetCollapsable::Validate(LaTeXFeatures & features) const
+void InsetCollapsable::open(BufferView * bv)
 {
-    inset->Validate(features);
+       if (!collapsed_) return;
+
+       collapsed_ = false;
+       bv->updateInset(this);
 }
 
 
-void InsetCollapsable::GetCursorPos(BufferView * bv, int & x, int & y) const
+void InsetCollapsable::close(BufferView * bv) const
 {
-    inset->GetCursorPos(bv, x , y);
+       if (collapsed_)
+               return;
+
+       collapsed_ = true;
+       bv->updateInset(const_cast<InsetCollapsable *>(this));
 }
 
 
-void InsetCollapsable::ToggleInsetCursor(BufferView * bv)
+void InsetCollapsable::setLabel(string const & l) const
 {
-    inset->ToggleInsetCursor(bv);
+       label = l;
 }
 
 
-UpdatableInset * InsetCollapsable::GetLockingInset()
+void InsetCollapsable::markErased()
 {
-    UpdatableInset * in = inset->GetLockingInset();
-    if (inset == in)
-       return this;
-    return in;
+       inset.markErased();
 }
 
 
-UpdatableInset * InsetCollapsable::GetFirstLockingInsetOfType(Inset::Code c)
+bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
 {
-    if (c == LyxCode())
-       return this;
-    return inset->GetFirstLockingInsetOfType(c);
+       bool found = inset.nextChange(bv, length);
+
+       if (first_after_edit && !found)
+               close(bv);
+       else if (!found)
+               first_after_edit = false;
+       return found;
 }
 
 
-void InsetCollapsable::SetFont(BufferView * bv,
-                              LyXFont const & font, bool toggleall)
+bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
+                                    bool cs, bool mw)
 {
-    inset->SetFont(bv, font, toggleall);
+       bool found = inset.searchForward(bv, str, cs, mw);
+       if (first_after_edit && !found)
+               close(bv);
+       else if (!found)
+               first_after_edit = false;
+       return found;
 }
 
 
-bool InsetCollapsable::doClearArea() const
+bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
+                                     bool cs, bool mw)
 {
-    return inset->doClearArea();
+       bool found = inset.searchBackward(bv, str, cs, mw);
+       if (first_after_edit && !found)
+               close(bv);
+       else if (!found)
+               first_after_edit = false;
+       return found;
 }
 
 
-LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
-                                      bool const recursive) const
+WordLangTuple const
+InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
 {
-    return inset->getLyXText(bv, recursive);
+       WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
+       if (first_after_edit && word.word().empty())
+               close(bv);
+       first_after_edit = false;
+       return word;
 }
 
 
-void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
+void InsetCollapsable::addPreview(grfx::PreviewLoader & loader) const
+{
+       inset.addPreview(loader);
+}
+
+
+void InsetCollapsable::cache(BufferView * bv) const
 {
-    inset->deleteLyXText(bv, recursive);
+       view_ = bv->owner()->view();
 }
 
 
-void InsetCollapsable::resizeLyXText(BufferView * bv) const
+BufferView * InsetCollapsable::view() const
 {
-    inset->resizeLyXText(bv);
-    LyXFont font(LyXFont::ALL_SANE);
-    oldWidth = width(bv, font);
+       return view_.lock().get();
 }