anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression concerning collapsing insets after search.

Browse Source 
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 4484cc7751)
This commit is contained in:
Richard Kimberly Heck 2019-03-14 20:28:01 -04:00
parent d3c47dcb13
commit 3ce4338e75
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/insets/InsetCollapsible.cpp
View File

@ -453,7 +453,7 @@ Inset * InsetCollapsible::editXY(Cursor & cur, int x, int y)
{ {
//lyxerr << "InsetCollapsible: edit xy" << endl; //lyxerr << "InsetCollapsible: edit xy" << endl;
if (geometry(cur.bv()) == ButtonOnly if (geometry(cur.bv()) == ButtonOnly
|| !editable() || !descendable(cur.bv())
|| (view_[&cur.bv()].button_dim_.contains(x, y) || (view_[&cur.bv()].button_dim_.contains(x, y)
&& geometry(cur.bv()) != NoButton)) && geometry(cur.bv()) != NoButton))
return this; return this;

2
status.23x
View File

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