From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Fri, 15 Mar 2019 00:28:01 +0000 (-0400)
Subject: Fix regression concerning collapsing insets after search.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2471
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4484cc775126e969d83f036561cfeb21d6751e79;p=features.git

Fix regression concerning collapsing insets after search.

To reproduce: Do a search for text in a footnote (say) that is
currently closed. Click inside the now open footnote. It will close
by itself.

We need to know whether we can go into the inset, not whether we can
edit once we're there.
---

diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index 31871419c9..0420452bb9 100644
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -476,7 +476,7 @@ Inset * InsetCollapsible::editXY(Cursor & cur, int x, int y)
 {
 	//lyxerr << "InsetCollapsible: edit xy" << endl;
 	if (geometry(cur.bv()) == ButtonOnly
-	    || !editable()
+		|| !descendable(cur.bv())
 	    || (view_[&cur.bv()].button_dim_.contains(x, y)
 	        && geometry(cur.bv()) != NoButton))
 		return this;