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 ghost caret

Browse Source 
This fixes a regression in e64ea357, where a test has been (badly)
tightened to avoid that two consecutive rows may be redrawn to get rid
of caret ghosts. The test prohibited empty rows from being redrawn.

Moreover, improve the test of cursor boundary to avoid the case where
cursor position is already 0.

Fixes bug #10952.
This commit is contained in:
Jean-Marc Lasgouttes 2018-01-08 11:49:40 +01:00
parent 4f21f788b4
commit 66c677b946
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/BufferView.cpp
View File

@ -2968,8 +2968,14 @@ namespace {
bool sliceInRow(CursorSlice const & cs, Text const * text, Row const & row) bool sliceInRow(CursorSlice const & cs, Text const * text, Row const & row)
{ {
/* The normal case is the last line. The previous line takes care
* of empty rows (e.g. empty paragraphs). Cursor boundary issues
* are taken care of when setting caret_slice_ in
* BufferView::draw.
*/
return !cs.empty() && cs.text() == text && cs.pit() == row.pit() return !cs.empty() && cs.text() == text && cs.pit() == row.pit()
&& row.pos() <= cs.pos() && cs.pos() < row.endpos(); && ((row.pos() == row.endpos() && row.pos() == cs.pos())
|| (row.pos() <= cs.pos() && cs.pos() < row.endpos()));
} }
} }
@ -3154,8 +3160,9 @@ void BufferView::draw(frontend::Painter & pain, bool paint_caret)
// Remember what has just been done for the next draw() step // Remember what has just been done for the next draw() step
if (paint_caret) { if (paint_caret) {
d->caret_slice_ = d->cursor_.top(); d->caret_slice_ = d->cursor_.top();
if (d->cursor_.boundary() if (d->caret_slice_.pos() > 0
|| d->cursor_.top().pos() == d->cursor_.top().lastpos()) && (d->cursor_.boundary()
|| d->caret_slice_.pos() == d->caret_slice_.lastpos()))
--d->caret_slice_.pos(); --d->caret_slice_.pos();
} else } else
d->caret_slice_ = CursorSlice(); d->caret_slice_ = CursorSlice();