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.

(cherry picked from commit 4484cc775126e969d83f036561cfeb21d6751e79)

diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index c20e9ce9881fcb0c7c419149d9fdd299d921459a..6c60e0b68e7a177f4ada985cb11f959ef48b1d7d 100644 (file)
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -453,7 +453,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;

diff --git a/status.23x b/status.23x
index 0d2e1370803e3142b78dd083d5e97ed4753d96b7..3030704bd5658e0ad9a8006bf225251e725d436c 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -108,6 +108,8 @@ What's new
 - Fix on-screen display of macros whose name is a single non-letter symbol
   (part of bug 11158).
 
+- Fix problem with collapsing insets after searches.
+
 - Do not swallow backspaces in custom viewer/editor paths (bug 9622).
 
 - Fix broken space dialog in mathed (bug 7747).