From de6f93296f891f3999750a8929c4e7e523f45723 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 21 Mar 2008 18:02:47 +0000
Subject: [PATCH] Context menu for collapsing minimalistic insets such as ERT.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23880 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ui/stdmenus.inc             |  8 ++++++++
 src/insets/InsetCollapsable.cpp | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 976be105e2..521f29116b 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -556,6 +556,14 @@ Menuset
 		Item "Go back to Reference|G" "bookmark-goto 0"
 	End
 
+#
+# InsetCollapsable context menu
+#
+	Menu "context-collapsable"
+		Item "Open Inset|O" "inset-toggle open"
+		Item "Close Inset|C" "inset-toggle close"
+	End
+
 #
 # Edit context menu
 #
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index eab66f093e..3722baf875 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -748,8 +748,9 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
 			return InsetText::getStatus(cur, cmd, flag);
 
 	case LFUN_INSET_TOGGLE:
-		if (cmd.argument() == "open" || cmd.argument() == "close" ||
-		    cmd.argument() == "toggle")
+		if ((cmd.argument() == "open" && status_ == Open)
+			|| (cmd.argument() == "close" && status_ != Open)
+			|| cmd.argument() == "toggle")
 			flag.enabled(true);
 		else
 			flag.enabled(false);
@@ -882,11 +883,14 @@ bool InsetCollapsable::undefined() const
 docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
 	int y) const
 {
-	if (geometry() != NoButton) {
-		Dimension dim = dimensionCollapsed();
-		if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
-			return docstring();
-	}
+	if (geometry() == NoButton)
+		return from_ascii("context-collapsable");
+
+	Dimension dim = dimensionCollapsed();
+	if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+		//FIXME: We should offer the "context-collapsable" menu here too but
+		// this is not possible right now because the cursor must be set first.
+		return docstring();
 
 	return InsetText::contextMenu(bv, x, y);
 }
-- 
2.39.2