anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not forget to set cursor current font when selecting

Browse Source 
Fix several unreleated cases where the `selecting' code path did not
reset cursor font correctly. This leads to a caret that does not have
the correct size, and can cause caret droppings with the new display
scheme.

(cherry picked from commit 88d0390724)
This commit is contained in:
Jean-Marc Lasgouttes 2017-10-11 11:56:09 +02:00
parent b79d07f4a5
commit 80983a3553
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cursor.cpp
View File

@ -1987,6 +1987,8 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
bool bound = false;
top().pos() = tm.getPosNearX(real_next_row, xo, bound);
boundary(bound);
// When selection==false, this is done by TextMetrics::editXY
setCurrentFont();
updateNeeded |= bv().checkDepm(*this, old);
}

3
src/Text3.cpp
View File

@ -835,6 +835,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
break;
}
cur.pos() = cur.lastpos();
cur.boundary(false);
cur.setCurrentFont();
needsUpdate |= cur != old_cur;
break;
@ -1713,6 +1715,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
// reset the anchor.
bvcur.setCursor(cur);
bvcur.selection(true);
bvcur.setCurrentFont();
if (cur.top() == old) {
// We didn't move one iota, so no need to update the screen.
cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor);