X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.C;h=e4015dd1cf24a5d968aec31aeb854c53e016e80d;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=408447e7fb52b5dbe451b83b35de41c20d826f66;hpb=271f8d7eec31175f53d012147af164cb27b043ce;p=lyx.git

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 408447e7fb..e4015dd1cf 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -19,21 +19,25 @@
 #include "lyxfont.h"
 #include "BufferView.h"
 #include "Painter.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
 #include "debug.h"
 #include "lyxtext.h"
 #include "font.h"
 #include "lyxlex.h"
 
-class LyXText;
+#include "insets/insettext.h"
+
+#include "support/LOstream.h"
+#include "support/lstrings.h"
 
+using std::vector;
 using std::ostream;
 using std::endl;
 using std::max;
 
 
+class LyXText;
+
+
 InsetCollapsable::InsetCollapsable(bool collapsed)
 	: UpdatableInset(), collapsed_(collapsed), 
 	  button_length(0), button_top_y(0), button_bottom_y(0),
@@ -195,7 +199,6 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
 
 	if (!isOpen()) {
 		draw_collapsed(pain, baseline, x);
-		x += TEXT_TO_INSET_OFFSET;
 		return;
 	}
 
@@ -243,7 +246,7 @@ void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
 		first_after_edit = true;
 		if (!bv->lockInset(this))
 			return;
-		bv->updateInset(this, true);
+		bv->updateInset(this, false);
 		inset.edit(bv);
 	} else {
 		if (!bv->lockInset(this))
@@ -271,7 +274,7 @@ void InsetCollapsable::edit(BufferView * bv, bool front)
 		if (!bv->lockInset(this))
 			return;
 		inset.setUpdateStatus(bv, InsetText::FULL);
-		bv->updateInset(this, true);
+		bv->updateInset(this, false);
 		inset.edit(bv, front);
 	} else {
 		if (!bv->lockInset(this))
@@ -323,10 +326,11 @@ void InsetCollapsable::insetButtonPress(BufferView * bv,
 }
 
 
-void InsetCollapsable::insetButtonRelease(BufferView * bv,
+bool InsetCollapsable::insetButtonRelease(BufferView * bv,
                                           int x, int y, int button)
 {
-	if ((x >= 0)  && (x < button_length) &&
+	bool ret = false;
+	if ((button != 3) && (x >= 0)  && (x < button_length) &&
 	    (y >= button_top_y) &&  (y <= button_bottom_y))
 	{
 		if (collapsed_) {
@@ -334,11 +338,11 @@ void InsetCollapsable::insetButtonRelease(BufferView * bv,
 // should not be called on inset open!
 //			inset.insetButtonRelease(bv, 0, 0, button);
 			inset.setUpdateStatus(bv, InsetText::FULL);
-			bv->updateInset(this, true);
+			bv->updateInset(this, false);
 		} else {
 			collapsed_ = true;
 			bv->unlockInset(this);
-			bv->updateInset(this, true);
+			bv->updateInset(this, false);
 		}
 	} else if (!collapsed_ && (y > button_bottom_y)) {
 		LyXFont font(LyXFont::ALL_SANE);
@@ -346,8 +350,12 @@ void InsetCollapsable::insetButtonRelease(BufferView * bv,
 		    (ascent_collapsed() +
 		     descent_collapsed() +
 		     inset.ascent(bv, font));
-		inset.insetButtonRelease(bv, x, yy, button);
+		ret = inset.insetButtonRelease(bv, x, yy, button);
 	}
+	if ((button == 3) && !ret) {
+		return showInsetDialog(bv);
+	}
+	return false;
 }
 
 
@@ -378,6 +386,24 @@ int InsetCollapsable::latex(Buffer const * buf, ostream & os,
 }
 
 
+int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
+{
+	return inset.ascii(buf, os, ll);
+}
+
+
+int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
+{
+	return inset.linuxdoc(buf, os);
+}
+
+
+int InsetCollapsable::docbook(Buffer const * buf, ostream & os) const
+{
+	return inset.docbook(buf, os);
+}
+
+#if 0
 int InsetCollapsable::getMaxWidth(BufferView * bv,
                                   UpdatableInset const * in) const
 {
@@ -395,6 +421,7 @@ int InsetCollapsable::getMaxWidth(BufferView * bv,
 	return UpdatableInset::getMaxWidth(bv, in);
 #endif
 }
+#endif
 
 
 void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
@@ -448,7 +475,7 @@ bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
 
 bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
 {
-	if (&inset == in)
+	if (in == this)
 		return true;
 	return inset.updateInsetInInset(bv, in);
 }
@@ -541,7 +568,7 @@ void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const
 }
 
 
-std::vector<string> const InsetCollapsable::getLabelList() const
+vector<string> const InsetCollapsable::getLabelList() const
 {
 	return inset.getLabelList();
 }
@@ -602,7 +629,7 @@ void InsetCollapsable::open(BufferView * bv)
 	if (!collapsed_) return;
 	
 	collapsed_ = false;
-	bv->updateInset(this, true);
+	bv->updateInset(this, false);
 }
 
 
@@ -612,7 +639,7 @@ void InsetCollapsable::close(BufferView * bv) const
 		return;
 	
 	collapsed_ = true;
-	bv->updateInset(const_cast<InsetCollapsable *>(this), true);
+	bv->updateInset(const_cast<InsetCollapsable *>(this), false);
 }
 
 
@@ -623,7 +650,7 @@ void InsetCollapsable::setLabel(string const & l) const
 
 
 bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
-                                     bool const & cs, bool const & mw)
+                                     bool cs, bool mw)
 {
 	bool found = inset.searchForward(bv, str, cs, mw);
 	if (first_after_edit && !found)
@@ -634,7 +661,7 @@ bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
 
 
 bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
-                                      bool const & cs, bool const & mw)
+                                      bool cs, bool mw)
 {
 	bool found = inset.searchBackward(bv, str, cs, mw);
 	if (first_after_edit && !found)
@@ -644,10 +671,10 @@ bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
 }
 
 
-string const InsetCollapsable::selectNextWord(BufferView * bv,
+string const InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv,
 					      float & value) const
 {
-	string const str = inset.selectNextWord(bv, value);
+	string const str = inset.selectNextWordToSpellcheck(bv, value);
 	if (first_after_edit && str.empty())
 		close(bv);
 	first_after_edit = false;