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

Fix bad cursor positioning when entering an inset

Browse Source 
The test added at 359aef92 was incorrect. Actually, Inset::editXY
returns the inset when it is edited and also when it is not, which
can be confusing. So if we are unlucky and the slices positions in the
text area and in the inner inset match, the code below triggers and
many bad things can happen.

Also improve the documentation of Inset::editXY and TextMetrics::editXY.

Fixes #10691.
This commit is contained in:
Jean-Marc Lasgouttes 2017-06-08 11:35:05 +02:00
parent 887445537a
commit c9fefd5a2c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TextMetrics.cpp
View File

@ -1379,7 +1379,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
// Try to descend recursively inside the inset.
Inset * edited = inset->editXY(cur, x, y);
if (edited == inset && cur.pos() == it->pos) {
// FIXME: it is not clear that the test on position is needed
// Remove it if/when semantics of editXY is clarified
if (cur.text() == text_ && cur.pos() == it->pos) {
// non-editable inset, set cursor after the inset if x is
// nearer to that position (bug 9628)
bool bound = false; // is modified by getPosNearX

4
src/TextMetrics.h
View File

@ -179,7 +179,9 @@ public:
that is completely visible
\param up whether we are going up or down (only used when
assert_in_view is true
\retval inset is non-null if the cursor is positionned inside
\retval inset is null if the cursor is positioned over normal
text in the current Text object. Otherwise it is the inset
that the cursor points to, like for Inset::editXY.
*/
/// FIXME: cleanup to use BufferView::getCoveringInset() and
/// setCursorFromCoordinates() instead of checkInsetHit().

6
src/insets/Inset.h
View File

@ -185,7 +185,11 @@ public:
/// cursor enters
virtual void edit(Cursor & cur, bool front,
EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
/// cursor enters
/// sets cursor recursively descending into nested editable insets
/**
\return the inset pointer if x,y is covering that inset
\param x,y are absolute screen coordinates.
*/
/// Note: this method must preserve the selection status. See:
/// https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg199001.html
virtual Inset * editXY(Cursor & cur, int x, int y);