X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.C;h=ce43acc582135c7dfc603ace9d0a760c7e93a5fe;hb=9f3dd22dd39c419522914846b21dd2b45720ad0a;hp=f5599fb6f2383c1c6ab12e1ef741895714d618ed;hpb=c2c571645b5fcea45422ded1cf5c28101c971917;p=lyx.git

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index f5599fb6f2..ce43acc582 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -24,6 +24,8 @@
 #include "support/lstrings.h"
 #include "debug.h"
 #include "lyxtext.h"
+#include "font.h"
+#include "lyxlex.h"
 
 class LyXText;
 
@@ -31,432 +33,614 @@ using std::ostream;
 using std::endl;
 using std::max;
 
-InsetCollapsable::InsetCollapsable()
-	: UpdatableInset(), inset(new InsetText)
+
+InsetCollapsable::InsetCollapsable(bool collapsed)
+	: UpdatableInset(), collapsed_(collapsed), 
+	  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)
 {
-	//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),
+	  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)
 {
-    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 " << tostr(collapsed_) << "\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;
+	lyxfont::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;
+	lyxfont::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;
+	lyxfont::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();
+
+	int widthCollapsed = width_collapsed();
 
-    return inset->width(bv, font) + widthCollapsed;
+	return (inset.width(bv, font) > widthCollapsed) ?
+		inset.width(bv, font) : widthCollapsed;
 }
 
 
-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
-{
-    Painter & pain = bv->painter();
-
-    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 (!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;
-    }
+                            int baseline, float & x, bool cleared) 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;
 
-    // not needed if collapsed
-    top_x = int(x);
-    top_baseline = baseline;
+	Painter & pain = bv->painter();
 
-    draw_collapsed(pain, f, baseline, x);
-    inset->draw(bv, f, baseline, x, cleared);
-    need_update = NONE;
+	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);
+		x += TEXT_TO_INSET_OFFSET;
+		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;
+
+	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 x, int y, unsigned int button)
+void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
+                            unsigned int button)
 {
-    UpdatableInset::Edit(bv, x, y, button);
+	UpdatableInset::edit(bv, xp, yp, 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);
-    }
+	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, true);
+		inset.edit(bv);
+	} else {
+		if (!bv->lockInset(this))
+			return;
+		if (yp <= button_bottom_y) {
+			inset.edit(bv);
+		} 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);
+		}
+	}
 }
 
 
-Inset::EDITABLE InsetCollapsable::Editable() const
+void InsetCollapsable::edit(BufferView * bv, bool front)
 {
-	if (collapsed)
-		return IS_EDITABLE;
-	return HIGHLY_EDITABLE;
+	UpdatableInset::edit(bv, front);
+
+	if (collapsed_) {
+		collapsed_ = false;
+		if (!bv->lockInset(this))
+			return;
+		inset.setUpdateStatus(bv, InsetText::FULL);
+		bv->updateInset(this, true);
+		inset.edit(bv, front);
+	} else {
+		if (!bv->lockInset(this))
+			return;
+		inset.edit(bv, front);
+	}
+	first_after_edit = true;
 }
 
 
-void InsetCollapsable::InsetUnlock(BufferView * bv)
+Inset::EDITABLE InsetCollapsable::editable() const
 {
-    if (autocollapse) {
-	collapsed = true;
-    }
-    inset->InsetUnlock(bv);
-    bv->updateInset(this, false);
+	if (collapsed_)
+		return IS_EDITABLE;
+	return HIGHLY_EDITABLE;
 }
 
 
-void InsetCollapsable::InsetButtonPress(BufferView * bv,int x,int y,int button)
+void InsetCollapsable::insetUnlock(BufferView * bv)
 {
-    if (!collapsed && (x >= button_length)) {
-	inset->InsetButtonPress(bv, x - widthCollapsed, y, button);
-    }
+#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);
 }
 
 
-void InsetCollapsable::InsetButtonRelease(BufferView * bv,
-					  int x, int y, int button)
+void InsetCollapsable::insetButtonPress(BufferView * bv,
+                                        int x, int y, int button)
 {
-    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);
+	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);
 	}
-    } else if (!collapsed && (x >= button_length) && (y >= button_top_y)) {
-	inset->InsetButtonRelease(bv, x - widthCollapsed, y, button);
-    }
 }
 
 
-void InsetCollapsable::InsetMotionNotify(BufferView * bv,
-					 int x, int y, int state)
-{
-    if (x >= button_length) {
-	inset->InsetMotionNotify(bv, x-widthCollapsed, y, state);
-    }
+void InsetCollapsable::insetButtonRelease(BufferView * bv,
+                                          int x, int y, int button)
+{
+	if ((x >= 0)  && (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, true);
+		} else {
+			collapsed_ = true;
+			bv->unlockInset(this);
+			bv->updateInset(this, true);
+		}
+	} 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));
+		inset.insetButtonRelease(bv, x, yy, button);
+	}
 }
 
 
-void InsetCollapsable::InsetKeyPress(XKeyEvent * xke)
+void InsetCollapsable::insetMotionNotify(BufferView * bv,
+                                         int x, int y, int state)
 {
-    inset->InsetKeyPress(xke);
+	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);
+	}
 }
 
 
-int InsetCollapsable::Latex(Buffer const * buf, ostream & os,
-			    bool fragile, bool free_spc) const
+void InsetCollapsable::insetKeyPress(XKeyEvent * xke)
 {
-    return inset->Latex(buf, os, fragile, free_spc);
+	inset.insetKeyPress(xke);
 }
 
 
-int InsetCollapsable::getMaxWidth(Painter & pain,
-				  UpdatableInset const * inset) const
+int InsetCollapsable::latex(Buffer const * buf, ostream & os,
+                            bool fragile, bool free_spc) const
 {
-    int const w = UpdatableInset::getMaxWidth(pain, inset);
-
-    if (w < 0) {
-	// What does a negative max width signify? (Lgb)
-	return w;
-    }
-    // should be at least 30 pixels !!!
-    return max(30, w - widthCollapsed);
+	return inset.latex(buf, os, fragile, free_spc);
 }
 
 
-#if 0
-int InsetCollapsable::getMaxTextWidth(Painter & pain,
-				      UpdatableInset const * inset) const
+int InsetCollapsable::getMaxWidth(BufferView * bv,
+                                  UpdatableInset const * in) const
 {
-    return getMaxWidth(pain, inset) - widthCollapsed;
-}
+#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
+}
 
 
 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);
+                              bool reinit)
+{
+	if (in_update) {
+		if (reinit && owner()) {
+			owner()->update(bv, font, true);
+		}
 		return;
 	}
-    }
-    if (oldWidth != width(bv, font)) {
-	oldWidth = width(bv, font);
-	inset->resizeLyXText(bv);
-	need_update = FULL;
-	if (owner()) {
-		owner()->update(bv, font);
-		return;
+	in_update = true;
+	inset.update(bv, font, reinit);
+	if (reinit && owner()) {
+		owner()->update(bv, font, true);
 	}
-    }
-    inset->update(bv, font);
+	in_update = false;
 }
 
 
 UpdatableInset::RESULT
-InsetCollapsable::LocalDispatch(BufferView * bv, kb_action action,
+InsetCollapsable::localDispatch(BufferView * bv, kb_action action,
 				string const & arg)
 {
-    UpdatableInset::RESULT result = inset->LocalDispatch(bv, action, arg);
-    if (result == FINISHED)
-        bv->unlockInset(this);
-    return result;
+	UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
+	if (result == FINISHED)
+		bv->unlockInset(this);
+	first_after_edit = false;
+	return result;
 }
 
 
-bool InsetCollapsable::LockInsetInInset(BufferView * bv, UpdatableInset * in)
+bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
 {
-    if (inset == in)
-	return true;
-    return inset->LockInsetInInset(bv, in);
+	if (&inset == in)
+		return true;
+	return inset.lockInsetInInset(bv, in);
 }
 
 
-bool InsetCollapsable::UnlockInsetInInset(BufferView * bv, UpdatableInset * in,
+bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
 					  bool lr)
 {
-    if (inset == in) {
-	bv->unlockInset(this);
-	return true;
-    }
-    return inset->UnlockInsetInInset(bv, in, lr);
+	if (&inset == in) {
+		bv->unlockInset(this);
+		return true;
+	}
+	return inset.unlockInsetInInset(bv, in, lr);
+}
+
+
+bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
+{
+	if (&inset == in)
+		return true;
+	return inset.updateInsetInInset(bv, in);
 }
 
 
-bool InsetCollapsable::UpdateInsetInInset(BufferView * bv, Inset *in)
+unsigned int InsetCollapsable::insetInInsetY()
 {
-    if (in == inset)
-	return true;
-    return inset->UpdateInsetInInset(bv, in);
+	return inset.insetInInsetY() - (top_baseline - inset.y());
 }
 
 
-unsigned int InsetCollapsable::InsetInInsetY()
+void InsetCollapsable::validate(LaTeXFeatures & features) const
 {
-    return inset->InsetInInsetY();
+	inset.validate(features);
 }
 
 
-void InsetCollapsable::Validate(LaTeXFeatures & features) const
+void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
 {
-    inset->Validate(features);
+	inset.getCursorPos(bv, x , y);
 }
 
 
-void InsetCollapsable::GetCursorPos(BufferView * bv, int & x, int & y) const
+void InsetCollapsable::toggleInsetCursor(BufferView * bv)
 {
-    inset->GetCursorPos(bv, x , y);
+	inset.toggleInsetCursor(bv);
 }
 
 
-void InsetCollapsable::ToggleInsetCursor(BufferView * bv)
+void InsetCollapsable::showInsetCursor(BufferView * bv, bool show)
 {
-    inset->ToggleInsetCursor(bv);
+	inset.showInsetCursor(bv, show);
 }
 
 
-UpdatableInset * InsetCollapsable::GetLockingInset()
+void InsetCollapsable::hideInsetCursor(BufferView * bv)
 {
-    UpdatableInset * in = inset->GetLockingInset();
-    if (inset == in)
-	return this;
-    return in;
+	inset.hideInsetCursor(bv);
 }
 
 
-UpdatableInset * InsetCollapsable::GetFirstLockingInsetOfType(Inset::Code c)
+UpdatableInset * InsetCollapsable::getLockingInset() const
 {
-    if (c == LyxCode())
-	return this;
-    return inset->GetFirstLockingInsetOfType(c);
+	UpdatableInset * in = inset.getLockingInset();
+	if (const_cast<InsetText *>(&inset) == in)
+		return const_cast<InsetCollapsable *>(this);
+	return in;
 }
 
 
-void InsetCollapsable::SetFont(BufferView * bv,
-			       LyXFont const & font, bool toggleall)
+UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(Inset::Code c)
 {
-    inset->SetFont(bv, font, toggleall);
+	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();
+	return inset.doClearArea();
 }
 
 
 LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
 				       bool const recursive) const
 {
-    return inset->getLyXText(bv, recursive);
+	return inset.getLyXText(bv, recursive);
 }
 
 
 void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
 {
-    inset->deleteLyXText(bv, recursive);
+	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);
+}
+
+
+std::vector<string> const InsetCollapsable::getLabelList() const
+{
+	return inset.getLabelList();
+}
+
+
+bool InsetCollapsable::nodraw() const
+{
+	return inset.nodraw();
+}
+
+ 
+int InsetCollapsable::scroll(bool recursive) const
+{
+	int sx = UpdatableInset::scroll(false);
+
+	if (recursive)
+		sx += inset.scroll(recursive);
+
+	return sx;
+}
+
+
+Paragraph * InsetCollapsable::getParFromID(int id) const
+{
+	lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
+	return inset.getParFromID(id);
+}
+
+
+Paragraph * InsetCollapsable::firstParagraph() const
+{
+	return inset.firstParagraph();
+}
+
+
+LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
+{
+	return inset.cursor(bv);
+}
+
+
+Inset * InsetCollapsable::getInsetFromID(int id_arg) const
+{
+	if (id_arg == id())
+		return const_cast<InsetCollapsable *>(this);
+	return inset.getInsetFromID(id_arg);
+}
+
+
+void InsetCollapsable::open(BufferView * bv)
+{
+	if (!collapsed_) return;
+	
+	collapsed_ = false;
+	bv->updateInset(this, true);
+}
+
+
+void InsetCollapsable::close(BufferView * bv) const
+{
+	if (collapsed_)
+		return;
+	
+	collapsed_ = true;
+	bv->updateInset(const_cast<InsetCollapsable *>(this), true);
+}
+
+
+void InsetCollapsable::setLabel(string const & l) const
+{
+	label = l;
+}
+
+
+bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
+                                     bool const & cs, bool const & mw)
+{
+	bool found = inset.searchForward(bv, str, cs, mw);
+	if (first_after_edit && !found)
+		close(bv);
+	first_after_edit = false;
+	return found;
+}
+bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
+                                      bool const & cs, bool const & mw)
+{
+	bool found = inset.searchBackward(bv, str, cs, mw);
+	if (first_after_edit && !found)
+		close(bv);
+	first_after_edit = false;
+	return found;
 }
 
 
-void InsetCollapsable::resizeLyXText(BufferView * bv) const
+string const InsetCollapsable::selectNextWord(BufferView * bv, float & value) const
 {
-    inset->resizeLyXText(bv);
-    LyXFont font(LyXFont::ALL_SANE);
-    oldWidth = width(bv, font);
+	string str = inset.selectNextWord(bv, value);
+	if (first_after_edit && str.empty())
+		close(bv);
+	first_after_edit = false;
+	return str;
 }