From 3ce4338e756e73a66e6f264f36c310a5853b8986 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Thu, 14 Mar 2019 20:28:01 -0400 Subject: [PATCH] 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) --- src/insets/InsetCollapsible.cpp | 2 +- status.23x | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp index c20e9ce988..6c60e0b68e 100644 --- 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 0d2e137080..3030704bd5 100644 --- 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). -- 2.39.5