From: Georg Baum <baum@lyx.org>
Date: Tue, 15 Mar 2016 20:35:50 +0000 (+0100)
Subject: Fix regression of 359aef92f87
X-Git-Tag: 2.2.0rc1~86
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4bab2ab5f873280ad4d7264ba06f9eaadaa09487;p=features.git

Fix regression of 359aef92f87

The context menu of newline insets was completely greyed out if one clicked
at the right of the inset. Thanks Scott for finding this. The fix is to undo
the cursor movement also for insets without settings, but with a context menu.
---

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 81ebe79977..8783d47910 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2203,7 +2203,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 		// inset (depending on cmd.x(), cmd.y()). This is needed for
 		// editing to fix bug 9628, but e.g. the context menu needs a
 		// cursor in front of the inset.
-		if (inset->hasSettings() &&
+		if ((inset->hasSettings() || !inset->contextMenuName().empty()) &&
 		    cur.nextInset() != inset && cur.prevInset() == inset)
 			cur.posBackward();
 	}