mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 18:24:48 +00:00
Fix bad cursor positioning when entering an inset
The test added at359aef92
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. (cherry picked from commitc9fefd5a2c
)
This commit is contained in:
parent
42facddf55
commit
04efc84abc
@ -1408,7 +1408,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
|
|||||||
|
|
||||||
// Try to descend recursively inside the inset.
|
// Try to descend recursively inside the inset.
|
||||||
Inset * edited = inset->editXY(cur, x, y);
|
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
|
// non-editable inset, set cursor after the inset if x is
|
||||||
// nearer to that position (bug 9628)
|
// nearer to that position (bug 9628)
|
||||||
bool bound = false; // is modified by getPosNearX
|
bool bound = false; // is modified by getPosNearX
|
||||||
|
@ -180,7 +180,9 @@ public:
|
|||||||
that is completely visible
|
that is completely visible
|
||||||
\param up whether we are going up or down (only used when
|
\param up whether we are going up or down (only used when
|
||||||
assert_in_view is true
|
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
|
/// FIXME: cleanup to use BufferView::getCoveringInset() and
|
||||||
/// setCursorFromCoordinates() instead of checkInsetHit().
|
/// setCursorFromCoordinates() instead of checkInsetHit().
|
||||||
|
@ -179,7 +179,13 @@ public:
|
|||||||
/// cursor enters
|
/// cursor enters
|
||||||
virtual void edit(Cursor & cur, bool front,
|
virtual void edit(Cursor & cur, bool front,
|
||||||
EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
|
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);
|
virtual Inset * editXY(Cursor & cur, int x, int y);
|
||||||
|
|
||||||
/// compute the size of the object returned in dim
|
/// compute the size of the object returned in dim
|
||||||
|
@ -69,6 +69,8 @@ What's new
|
|||||||
|
|
||||||
- Fix glacial performance with ancient Hebrew text on macOS.
|
- Fix glacial performance with ancient Hebrew text on macOS.
|
||||||
|
|
||||||
|
- Fix potential crash when cursor enters an inset (bug 10691).
|
||||||
|
|
||||||
|
|
||||||
* INTERNALS
|
* INTERNALS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user