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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 622dc4f14a..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;
 
@@ -32,26 +34,41 @@ using std::endl;
 using std::max;
 
 
-InsetCollapsable::InsetCollapsable()
-	: UpdatableInset()
+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.setOwner(this);
-	collapsed_ = false;
-	label = "Label";
-	autocollapse = true;
 	inset.setAutoBreakRows(true);
 	inset.setDrawFrame(0, InsetText::ALWAYS);
 	inset.setFrameColor(0, LColor::collapsableframe);
-	button_length = button_top_y = button_bottom_y = 0;
 	setInsetName("Collapsable");
-	widthCollapsed = oldWidth = 0;
-	need_update = FULL;
+}
+
+
+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)
+{
+	inset.init(&(in.inset), same_id);
+	inset.setOwner(this);
 }
 
 
 bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
 {
-	if (!insertInsetAllowed(in)) {
+	if (!insetAllowed(in->lyxCode())) {
 		lyxerr << "InsetCollapsable::InsertInset: "
 			"Unable to insert inset." << endl;
 		return false;
@@ -70,66 +87,66 @@ void InsetCollapsable::write(Buffer const * buf, ostream & os) const
 
 void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
 {
-	if (lex.IsOK()) {
+	if (lex.isOK()) {
 		lex.next();
-		string const token = lex.GetString();
+		string const token = lex.getString();
 		if (token == "collapsed") {
 			lex.next();
-			collapsed_ = lex.GetBool();
+			collapsed_ = lex.getBool();
 		} else {
 			lyxerr << "InsetCollapsable::Read: Missing collapsed!"
 			       << endl;
+			// Take countermeasures
+			lex.pushToken(token);
 		}
 	}
 	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);
+	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);
+	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);
+	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
 {
-	return ascent_collapsed(bv->painter(), font);
+	return ascent_collapsed();
 }
 
 
 int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
 {
 	if (collapsed_) 
-		return descent_collapsed(bv->painter(), font);
+		return descent_collapsed();
 
-	return descent_collapsed(bv->painter(), font)
+	return descent_collapsed()
 		+ inset.descent(bv, font)
 		+ inset.ascent(bv, font)
 		+ TEXT_TO_BOTTOM_OFFSET;
@@ -139,110 +156,132 @@ int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
 int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
 {
 	if (collapsed_) 
-		return widthCollapsed;
+		return width_collapsed();
+
+	int widthCollapsed = width_collapsed();
 
 	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;
+			baseline, label, labelfont);
+	x += width_collapsed();
 }
 
 
 void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, 
-			    int baseline, float & x, bool cleared) const
+                            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;
 
 	Painter & pain = bv->painter();
 
-	button_length = widthCollapsed;
+	button_length = width_collapsed();
 	button_top_y = -ascent(bv, f);
-	button_bottom_y = -ascent(bv, f) + ascent_collapsed(pain,f) +
-		descent_collapsed(pain, f);
+	button_bottom_y = -ascent(bv, f) + ascent_collapsed() +
+		descent_collapsed();
 
-	if (collapsed_) {
-		draw_collapsed(pain, f, baseline, x);
+	if (!isOpen()) {
+		draw_collapsed(pain, baseline, x);
 		x += TEXT_TO_INSET_OFFSET;
 		return;
 	}
 
 	float old_x = x;
 
-#if 0
-	UpdatableInset::draw(bv, f, baseline, x, cleared);
-#else
 	if (!owner())
 		x += static_cast<float>(scroll());
-#endif
+
 	if (!cleared && (inset.need_update == InsetText::FULL ||
-			 inset.need_update == InsetText::INIT ||
-			 top_x != int(x) ||
-			 top_baseline != baseline))
+	                 inset.need_update == InsetText::INIT ||
+	                 top_x != int(x) ||
+	                 top_baseline != baseline))
 	{
-#if 1
 		// 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;
-#else
-		int w =  owner() ? width(bv, f) : pain.paperWidth();
-		int h = ascent(bv, f) + descent(bv, f);
-		int const tx = (needFullRow() && !owner()) ? 0 : int(x);
-		int const 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;
-#endif
 	}
 
 	top_x = int(x);
+	topx_set = true;
 	top_baseline = baseline;
 
-	int const bl = baseline - ascent(bv, f) + ascent_collapsed(pain, f);
-
-	draw_collapsed(pain, f, bl, old_x);
+	int const bl = baseline - ascent(bv, f) + ascent_collapsed();
+	
+	draw_collapsed(pain, bl, old_x);
 	inset.draw(bv, f, 
-		   bl + descent_collapsed(pain, f) + inset.ascent(bv, f),
-		   x, cleared);
-	need_update = NONE;
+			   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,
-			    unsigned int button)
+                            unsigned int 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, 0, 0, button);
+		bv->updateInset(this, true);
+		inset.edit(bv);
 	} else {
 		if (!bv->lockInset(this))
 			return;
-		inset.edit(bv, xp, yp + (top_baseline - inset.y()), button);
+		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);
+		}
 	}
 }
 
 
+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, true);
+		inset.edit(bv, front);
+	} else {
+		if (!bv->lockInset(this))
+			return;
+		inset.edit(bv, front);
+	}
+	first_after_edit = true;
+}
+
+
 Inset::EDITABLE InsetCollapsable::editable() const
 {
 	if (collapsed_)
@@ -253,9 +292,16 @@ Inset::EDITABLE InsetCollapsable::editable() const
 
 void InsetCollapsable::insetUnlock(BufferView * bv)
 {
+#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);
@@ -263,43 +309,58 @@ void InsetCollapsable::insetUnlock(BufferView * bv)
 }
 
 
-void InsetCollapsable::insetButtonPress(BufferView * bv, int x, int y,
-					int button)
+void InsetCollapsable::insetButtonPress(BufferView * bv,
+                                        int x, int y, int button)
 {
 	if (!collapsed_ && (y > button_bottom_y)) {
-		inset.insetButtonPress(bv, x, y + (top_baseline - inset.y()),
-				       button);
+		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);
 	}
 }
 
 
 void InsetCollapsable::insetButtonRelease(BufferView * bv,
-					  int x, int y, int button)
+                                          int x, int y, int button)
 {
 	if ((x >= 0)  && (x < button_length) &&
-	    (y >= button_top_y) &&  (y <= button_bottom_y)) {
+	    (y >= button_top_y) &&  (y <= button_bottom_y))
+	{
 		if (collapsed_) {
 			collapsed_ = false;
-			inset.insetButtonRelease(bv, 0, 0, button);
-			bv->updateInset(this, 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, false);
+			bv->updateInset(this, true);
 		}
-	} else if (!collapsed_ && (y > button_top_y)) {
-		inset.insetButtonRelease(bv, x, y + (top_baseline-inset.y()),
-					 button);
+	} 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::insetMotionNotify(BufferView * bv,
-					 int x, int y, int state)
-{
-	if (x > button_bottom_y) {
-		inset.insetMotionNotify(bv, x, y + (top_baseline - inset.y()),
-					state);
+                                         int x, int y, int 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);
 	}
 }
 
@@ -311,16 +372,17 @@ void InsetCollapsable::insetKeyPress(XKeyEvent * xke)
 
 
 int InsetCollapsable::latex(Buffer const * buf, ostream & os,
-			    bool fragile, bool free_spc) const
+                            bool fragile, bool free_spc) const
 {
 	return inset.latex(buf, os, fragile, free_spc);
 }
 
 
 int InsetCollapsable::getMaxWidth(BufferView * bv,
-				  UpdatableInset const * inset) const
+                                  UpdatableInset const * in) const
 {
-	int const w = UpdatableInset::getMaxWidth(bv, inset);
+#if 0
+	int const w = UpdatableInset::getMaxWidth(bv, in);
 
 	if (w < 0) {
 		// What does a negative max width signify? (Lgb)
@@ -328,38 +390,28 @@ int InsetCollapsable::getMaxWidth(BufferView * bv,
 		return w;
 	}
 	// should be at least 30 pixels !!!
-	return max(30, w - widthCollapsed);
+	return max(30, w - width_collapsed());
+#else
+	return UpdatableInset::getMaxWidth(bv, in);
+#endif
 }
 
 
 void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
-			      bool reinit)
+                              bool reinit)
 {
-	if (reinit) {
-		need_update = FULL;
-		if (owner())
+	if (in_update) {
+		if (reinit && 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;
-		}
+	in_update = true;
+	inset.update(bv, font, reinit);
+	if (reinit && owner()) {
+		owner()->update(bv, font, true);
 	}
-	if (oldWidth != width(bv, font)) {
-		oldWidth = width(bv, font);
-		inset.resizeLyXText(bv);
-		need_update = FULL;
-		if (owner()) {
-			owner()->update(bv, font);
-			return;
-		}
-	}
-	inset.update(bv, font);
+	in_update = false;
 }
 
 
@@ -370,6 +422,7 @@ InsetCollapsable::localDispatch(BufferView * bv, kb_action action,
 	UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
 	if (result == FINISHED)
 		bv->unlockInset(this);
+	first_after_edit = false;
 	return result;
 }
 
@@ -425,6 +478,18 @@ void InsetCollapsable::toggleInsetCursor(BufferView * bv)
 }
 
 
+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();
@@ -501,6 +566,7 @@ int InsetCollapsable::scroll(bool recursive) const
 
 Paragraph * InsetCollapsable::getParFromID(int id) const
 {
+	lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
 	return inset.getParFromID(id);
 }
 
@@ -524,10 +590,57 @@ Inset * InsetCollapsable::getInsetFromID(int id_arg) const
 	return inset.getInsetFromID(id_arg);
 }
 
-void InsetCollapsable::collapsed(BufferView * bv, bool flag)
+
+void InsetCollapsable::open(BufferView * bv)
+{
+	if (!collapsed_) return;
+	
+	collapsed_ = false;
+	bv->updateInset(this, true);
+}
+
+
+void InsetCollapsable::close(BufferView * bv) const
 {
-	if (flag == collapsed_)
+	if (collapsed_)
 		return;
-	collapsed_ = flag;
-	bv->updateInset(this, false);
+	
+	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;
+}
+
+
+string const InsetCollapsable::selectNextWord(BufferView * bv, float & value) const
+{
+	string str = inset.selectNextWord(bv, value);
+	if (first_after_edit && str.empty())
+		close(bv);
+	first_after_edit = false;
+	return str;
 }