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

Fix: shift-mouse selection doesn't work well across insets

Browse Source 
(FIXME in the code, no corresponding ticket found even though it is pretty
annoying)
This commit is contained in:
Guillaume Munch 2016-09-04 23:24:57 +01:00
parent c36ada6b96
commit c9fc5bf1c6
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/BufferView.cpp
View File

@ -2517,7 +2517,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old)
} }
bool BufferView::mouseSetCursor(Cursor & cur, bool select) bool BufferView::mouseSetCursor(Cursor & cur, bool const select)
{ {
LASSERT(&cur.bv() == this, return false); LASSERT(&cur.bv() == this, return false);
@ -2535,27 +2535,23 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
if (leftinset) if (leftinset)
d->cursor_.fixIfBroken(); d->cursor_.fixIfBroken();
// FIXME: shift-mouse selection doesn't work well across insets.
bool const do_selection =
select && &d->cursor_.normalAnchor().inset() == &cur.inset();
// do the dEPM magic if needed // do the dEPM magic if needed
// FIXME: (1) move this to InsetText::notifyCursorLeaves? // FIXME: (1) move this to InsetText::notifyCursorLeaves?
// FIXME: (2) if we had a working InsetText::notifyCursorLeaves, // FIXME: (2) if we had a working InsetText::notifyCursorLeaves,
// the leftinset bool would not be necessary (badcursor instead). // the leftinset bool would not be necessary (badcursor instead).
bool update = leftinset; bool update = leftinset;
if (!do_selection && d->cursor_.inTexted())
update |= checkDepm(cur, d->cursor_);
if (!do_selection) if (select) {
d->cursor_.resetAnchor();
d->cursor_.setCursor(cur);
d->cursor_.boundary(cur.boundary());
if (do_selection)
d->cursor_.setSelection(); d->cursor_.setSelection();
else d->cursor_.setCursorSelectionTo(cur);
} else {
if (d->cursor_.inTexted())
update |= checkDepm(cur, d->cursor_);
d->cursor_.resetAnchor();
d->cursor_.setCursor(cur);
d->cursor_.clearSelection(); d->cursor_.clearSelection();
}
d->cursor_.boundary(cur.boundary());
d->cursor_.finishUndo(); d->cursor_.finishUndo();
d->cursor_.setCurrentFont(); d->cursor_.setCurrentFont();
if (update) if (update)