bool sliceInRow(CursorSlice const & cs, Text const * text, Row const & row)
{
return !cs.empty() && cs.text() == text && cs.pit() == row.pit()
- && row.pos() <= cs.pos() && cs.pos() <= row.endpos();
+ && row.pos() <= cs.pos() && cs.pos() < row.endpos();
}
}
}
// Remember what has just been done for the next draw() step
- if (paint_caret)
+ if (paint_caret) {
d->caret_slice_ = d->cursor_.top();
- else
+ if (d->cursor_.boundary())
+ --d->caret_slice_.pos();
+ } else
d->caret_slice_ = CursorSlice();
}
#include "frontends/Painter.h"
#include "frontends/NullPainter.h"
+#include "support/convert.h"
#include "support/debug.h"
#include "support/lassert.h"
LYXERR(Debug::PAINTING, "Clear rect@("
<< max(row_x, 0) << ", " << y - row.ascent() << ")="
<< width() << " x " << row.height());
- pi.pain.fillRectangle(max(row_x, 0), y - row.ascent(),
- width(), row.height(), pi.background_color);
+ // FIXME: this is a hack. We know that at least this
+ // amount of pixels can be cleared on right and left.
+ // Doing so gets rid of caret ghosts when the cursor is at
+ // the begining/end of row. However, it will not work if
+ // the caret has a ridiculous width like 6. (see ticket
+ // #10797)
+ pi.pain.fillRectangle(max(row_x, 0) - Inset::TEXT_TO_INSET_OFFSET,
+ y - row.ascent(),
+ width() + 2 * Inset::TEXT_TO_INSET_OFFSET,
+ row.height(), pi.background_color);
}
// Instrumentation for testing row cache (see also
row_x + row.right_x() > bv_->workWidth());
y += row.descent();
+#if 0
+ // This debug code shows on screen which rows are repainted.
+ // FIXME: since the updates related to caret blinking restrict
+ // the painter to a small rectangle, the numbers are not
+ // updated when this happens. Change the code in
+ // GuiWorkArea::Private::show/hideCaret if this is important.
+ static int count = 0;
+ ++count;
+ FontInfo fi(sane_font);
+ fi.setSize(FONT_SIZE_TINY);
+ fi.setColor(Color_red);
+ pi.pain.text(row_x, y, convert<docstring>(count), fi);
+#endif
+
// Restore full_repaint status.
pi.full_repaint = tmp;