X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2Finsetcollapsable.C;h=facf2f5f362fd3f6cfcfd26aa19105deab1eaa21;hb=b634b3eb3b5cc1c47fd3bc63294e16536d4f7664;hp=d646ce22951bad1f94180c1b9da5ae61d48fb6bb;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index d646ce2295..0c8a5bef1b 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -7,500 +7,364 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "insetcollapsable.h"
-#include "insettext.h"
 
+#include "buffer.h"
 #include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
-#include "gettext.h"
-#include "lyxfont.h"
+#include "dispatchresult.h"
+#include "LColor.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "WordLangTuple.h"
 #include "funcrequest.h"
+#include "metricsinfo.h"
+#include "paragraph.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);
+	os << "\n";
+	inset.text_.write(buf, os);
 }
 
 
-void InsetCollapsable::write(Buffer const * buf, ostream & os) const
-{
-	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)
 {
+	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;
+	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;
 }
 
 
-int InsetCollapsable::ascent(BufferView * /*bv*/, LyXFont const &) const
+void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
 {
-	return ascent_collapsed();
+	pi.pain.buttonText(x, y, label, labelfont_);
 }
 
 
-int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-	if (collapsed_)
-		return descent_collapsed();
+	setPosCache(pi, x, y);
 
-	return descent_collapsed()
-		+ inset.descent(bv, font)
-		+ inset.ascent(bv, font)
-		+ TEXT_TO_BOTTOM_OFFSET;
+	if (status_ == Inlined) {
+		inset.draw(pi, x, y);
+	} else {
+		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());
+		}
+	}
 }
 
 
-int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
+void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
-	if (collapsed_)
-		return width_collapsed();
-
-	int widthCollapsed = width_collapsed();
-
-	return (inset.width(bv, font) > widthCollapsed) ?
-		inset.width(bv, font) : widthCollapsed;
+	inset.drawSelection(pi, x, y);
 }
 
 
-void InsetCollapsable::draw_collapsed(Painter & pain,
-				      int baseline, float & x) const
+InsetOld::EDITABLE InsetCollapsable::editable() const
 {
-	pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
-			baseline, label, labelfont);
-	x += width_collapsed();
+	return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
-			    int baseline, float & x, bool cleared) const
+bool InsetCollapsable::descendable() 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;
-
-	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;
+	return status_ != Collapsed;
 }
 
 
-void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
-			    mouse_button::state button)
+void InsetCollapsable::lfunMouseRelease(LCursor & cur, FuncRequest & cmd)
 {
-#ifdef WITH_WARNINGS
-#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
-#endif
-	if (button == mouse_button::button3)
+	if (cmd.button() == mouse_button::button3) {
+		showInsetDialog(&cur.bv());
 		return;
-
-	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);
-	} 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);
-		}
-	}
-}
-
-
-void InsetCollapsable::edit(BufferView * bv, bool front)
-{
-	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);
 	}
-}
 
+	switch (status_) {
 
-Inset::EDITABLE InsetCollapsable::editable() const
-{
-	if (collapsed_)
-		return IS_EDITABLE;
-	return HIGHLY_EDITABLE;
-}
+	case Collapsed:
+		lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
+		setStatus(Open);
+		edit(cur, true);
+		break;
 
-
-void InsetCollapsable::insetUnlock(BufferView * bv)
-{
-#if 0
-	if (autocollapse) {
-		if (change_label_with_text) {
-			draw_label = get_new_label();
-		} else {
-			draw_label = label;
+	case Open: {
+		FuncRequest cmd1 = cmd;
+		if (hitButton(cmd1)) {
+			lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+			setStatus(Collapsed);
+			cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+			break;
 		}
-		collapsed_ = true;
+		lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
+		inset.dispatch(cur, cmd);
+		break;
 	}
-#endif
-	inset.insetUnlock(bv);
-	if (scroll())
-		scroll(bv, 0.0F);
-	bv->updateInset(this, false);
-}
-
 
-void InsetCollapsable::lfunMousePress(FuncRequest const & cmd)
-{
-	if (!collapsed_ && (cmd.y > button_bottom_y)) {
-		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));
-		inset.localDispatch(cmd1);
+	case Inlined:
+		inset.dispatch(cur, cmd);
+		break;
 	}
 }
 
 
-bool InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
+int InsetCollapsable::latex(Buffer const & buf, ostream & os,
+			    OutputParams const & runparams) const
 {
-	bool ret = false;
-	BufferView * bv = cmd.view();
-	if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
-	    (cmd.y >= button_top_y) && (cmd.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);
-		}
-	} else if (!collapsed_ && (cmd.y > button_bottom_y)) {
-		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));
-		ret = (inset.localDispatch(cmd1) == DISPATCHED);
-	}
-	if (cmd.button() == mouse_button::button3 && !ret)
-		return showInsetDialog(bv);
-	return ret;
+	return inset.latex(buf, os, runparams);
 }
 
 
-void InsetCollapsable::lfunMouseMotion(FuncRequest const & cmd)
+int InsetCollapsable::plaintext(Buffer const & buf, ostream & os,
+			    OutputParams const & runparams) const
 {
-	if (cmd.y > button_bottom_y) {
-		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));
-		inset.localDispatch(cmd1);
-	}
+	return inset.plaintext(buf, os, runparams);
 }
 
 
-int InsetCollapsable::latex(Buffer const * buf, ostream & os,
-			    bool fragile, bool free_spc) const
+int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os,
+			       OutputParams const & runparams) const
 {
-	return inset.latex(buf, os, fragile, free_spc);
+	return inset.linuxdoc(buf, os, runparams);
 }
 
 
-int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
+int InsetCollapsable::docbook(Buffer const & buf, ostream & os,
+			      OutputParams const & runparams) const
 {
-	return inset.ascii(buf, os, ll);
+	return inset.docbook(buf, os, runparams);
 }
 
 
-int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
+bool InsetCollapsable::hitButton(FuncRequest & cmd) const
 {
-	return inset.linuxdoc(buf, os);
+	return button_dim.contains(cmd.x, cmd.y);
 }
 
 
-int InsetCollapsable::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+string const InsetCollapsable::getNewLabel(string const & l) const
 {
-	return inset.docbook(buf, os, mixcont);
+	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;
+	}
+	if (inset.paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
+		label += "...";
+	}
+	return label.empty() ? l : label;
 }
 
-#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
+void InsetCollapsable::edit(LCursor & cur, bool left)
+{
+	//lyxerr << "InsetCollapsable: edit left/right" << endl;
+	cur.push(*this);
+	inset.edit(cur, left);
+	open();
 }
-#endif
 
 
-void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
-			      bool reinit)
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 {
-	if (in_update) {
-		if (reinit && owner()) {
-			owner()->update(bv, font, true);
-		}
-		return;
-	}
-	in_update = true;
-	inset.update(bv, font, reinit);
-	if (reinit && owner()) {
-		owner()->update(bv, font, 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;
 	}
-	in_update = false;
+	return inset.editXY(cur, x, y);
 }
 
 
-Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+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:
-			lfunMousePress(cmd);
-			return DISPATCHED;
+			if (status_ == Inlined)
+				inset.dispatch(cur, cmd);
+			else if (status_ == Open && !hitButton(cmd))
+				inset.dispatch(cur, cmd);
+			break;
 
 		case LFUN_MOUSE_MOTION:
-			lfunMouseMotion(cmd);
-			return DISPATCHED;
+			if (status_ == Inlined)
+				inset.dispatch(cur, cmd);
+			else if (status_ == Open && !hitButton(cmd))
+				inset.dispatch(cur, cmd);
+			break;
 
 		case LFUN_MOUSE_RELEASE:
-			lfunMouseRelease(cmd);
-			return DISPATCHED;
+			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:
-			UpdatableInset::RESULT result = inset.localDispatch(cmd);
-			if (result >= FINISHED)
-				cmd.view()->unlockInset(this);
-			first_after_edit = false;
-			return result;
+			inset.dispatch(cur, cmd);
+			break;
 	}
-	return UNDISPATCHED;
-}
-
-
-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)
+bool InsetCollapsable::getStatus(LCursor & cur, FuncRequest const & cmd,
+	FuncStatus & flag) const
 {
-	if (&inset == in) {
-		bv->unlockInset(this);
-		return true;
-	}
-	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());
+	return inset.getStatus(cur, cmd, flag);
 }
 
 
@@ -510,90 +374,17 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
-{
-	inset.getCursorPos(bv, x , y);
-}
-
-
-void InsetCollapsable::toggleInsetCursor(BufferView * bv)
+void InsetCollapsable::getCursorPos(CursorSlice const & cur,
+	int & x, int & y) const
 {
-	inset.toggleInsetCursor(bv);
+	inset.getCursorPos(cur, x, y);
 }
 
 
-void InsetCollapsable::showInsetCursor(BufferView * bv, bool show)
+void InsetCollapsable::getLabelList(Buffer const & buffer,
+				    std::vector<string> & list) const
 {
-	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
-{
-	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);
-}
-
-
-vector<string> const InsetCollapsable::getLabelList() const
-{
-	return inset.getLabelList();
-}
-
-
-bool InsetCollapsable::nodraw() const
-{
-	return inset.nodraw();
+	inset.getLabelList(buffer, list);
 }
 
 
@@ -602,124 +393,94 @@ int InsetCollapsable::scroll(bool recursive) const
 	int sx = UpdatableInset::scroll(false);
 
 	if (recursive)
-		sx += inset.scroll(recursive);
+		sx += inset.scroll(false);
 
 	return sx;
 }
 
 
-Paragraph * InsetCollapsable::getParFromID(int id) const
+size_t InsetCollapsable::nargs() const
 {
-	lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
-	return inset.getParFromID(id);
+	return inset.nargs();
 }
 
 
-Paragraph * InsetCollapsable::firstParagraph() const
+LyXText * InsetCollapsable::getText(int i) const
 {
-	return inset.firstParagraph();
+	return inset.getText(i);
 }
 
 
-Paragraph * InsetCollapsable::getFirstParagraph(int i) const
+void InsetCollapsable::open()
 {
-	return inset.getFirstParagraph(i);
+	if (status_ == Collapsed)   // ...but not inlined
+		setStatus(Open);
 }
 
 
-LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
+void InsetCollapsable::close()
 {
-	return inset.cursor(bv);
+	setStatus(Collapsed);
 }
 
 
-Inset * InsetCollapsable::getInsetFromID(int id_arg) const
+void InsetCollapsable::setLabel(string const & l)
 {
-	if (id_arg == id())
-		return const_cast<InsetCollapsable *>(this);
-	return inset.getInsetFromID(id_arg);
+	label = l;
 }
 
 
-void InsetCollapsable::open(BufferView * bv)
+void InsetCollapsable::setStatus(CollapseStatus st)
 {
-	if (!collapsed_) return;
-
-	collapsed_ = false;
-	bv->updateInset(this, false);
+	status_ = st;
+	setButtonLabel();
 }
 
 
-void InsetCollapsable::close(BufferView * bv) const
+void InsetCollapsable::markErased()
 {
-	if (collapsed_)
-		return;
-
-	collapsed_ = true;
-	bv->updateInset(const_cast<InsetCollapsable *>(this), false);
+	inset.markErased();
 }
 
 
-void InsetCollapsable::setLabel(string const & l) const
+void InsetCollapsable::addPreview(PreviewLoader & loader) const
 {
-	label = l;
+	inset.addPreview(loader);
 }
 
 
-void InsetCollapsable::markErased()
+bool InsetCollapsable::insetAllowed(InsetOld::Code code) const
 {
-	inset.markErased();
+	return inset.insetAllowed(code);
 }
 
- 
-bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
+
+void InsetCollapsable::setLabelFont(LyXFont & font)
 {
-	bool found = inset.nextChange(bv, length);
- 
-	if (first_after_edit && !found)
-		close(bv);
-	else if (!found)
-		first_after_edit = false;
-	return found;
+	labelfont_ = font;
 }
 
- 
-bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
-				     bool cs, bool mw)
+
+void InsetCollapsable::scroll(BufferView & bv, float sx) const
 {
-	bool found = inset.searchForward(bv, str, cs, mw);
-	if (first_after_edit && !found)
-		close(bv);
-	else if (!found)
-		first_after_edit = false;
-	return found;
+	UpdatableInset::scroll(bv, sx);
 }
 
 
-bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
-				      bool cs, bool mw)
+void InsetCollapsable::scroll(BufferView & bv, int offset) const
 {
-	bool found = inset.searchBackward(bv, str, cs, mw);
-	if (first_after_edit && !found)
-		close(bv);
-	else if (!found)
-		first_after_edit = false;
-	return found;
+	UpdatableInset::scroll(bv, offset);
 }
 
 
-WordLangTuple const
-InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
+Box const & InsetCollapsable::buttonDim() const
 {
-	WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
-	if (first_after_edit && word.word().empty())
-		close(bv);
-	first_after_edit = false;
-	return word;
+	return button_dim;
 }
 
 
-void InsetCollapsable::addPreview(grfx::PreviewLoader & loader) const
+void InsetCollapsable::setBackgroundColor(LColor_color color)
 {
-	inset.addPreview(loader);
+	InsetOld::setBackgroundColor(color);
+	inset.setBackgroundColor(color);
 }