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

Some tweaks to selection painting

Browse Source 
1/ simplify logic that triggers margin selection painting

2/ fix logic for end of paragraph markers. They are now selected when
   there is an end row margin selection.

3/ avoid rounding problems due to int/double conversions.
This commit is contained in:
Jean-Marc Lasgouttes 2016-10-26 14:23:59 +02:00
parent 4159cf97c1
commit 695b0cc33b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/RowPainter.cpp
View File

@ -614,21 +614,29 @@ void RowPainter::paintSelection() const
bool const rtl = text_.isRTL(par_); bool const rtl = text_.isRTL(par_);
// draw the margins // draw the margins
if ((row_.begin_margin_sel && !rtl) || (row_.end_margin_sel && rtl)) if (rtl ? row_.end_margin_sel : row_.begin_margin_sel)
pi_.pain.fillRectangle(int(xo_), y1, row_.left_margin, y2 - y1, pi_.pain.fillRectangle(int(xo_), y1, row_.left_margin, y2 - y1,
Color_selection); Color_selection);
// go through row and draw from RTL boundary to RTL boundary // go through row and draw from RTL boundary to RTL boundary
double x = xo_ + row_.left_margin; double x = xo_ + row_.left_margin;
for (auto const & e : row_) { for (auto const & e : row_) {
// These are the same tests as in paintStringAndSel, except
// that all_sel has an additional clause that triggers for end
// of paragraph markers. The clause was not used in
// paintStringAndSel to avoid changing the drawing color.
// at least part of text selected? // at least part of text selected?
bool const some_sel = (e.endpos >= row_.sel_beg && e.pos <= row_.sel_end) bool const some_sel = (e.endpos >= row_.sel_beg && e.pos < row_.sel_end)
|| pi_.selected; || pi_.selected;
// all the text selected? // all the text selected?
bool const all_sel = (e.pos >= row_.sel_beg && e.endpos <= row_.sel_end) bool const all_sel = (e.pos >= row_.sel_beg && e.endpos < row_.sel_end)
|| pi_.selected; || (e.isVirtual() && e.pos == row_.endpos() && row_.end_margin_sel)
|| pi_.selected;
if (all_sel) { if (all_sel) {
pi_.pain.fillRectangle(int(x), y1, int(e.full_width()), y2 - y1, // the 3rd argument is written like that to avoid rounding issues
pi_.pain.fillRectangle(int(x), y1,
int(x + e.full_width()) - int(x), y2 - y1,
Color_selection); Color_selection);
} else if (some_sel) { } else if (some_sel) {
pos_type const from = min(max(row_.sel_beg, e.pos), e.endpos); pos_type const from = min(max(row_.sel_beg, e.pos), e.endpos);
@ -643,7 +651,7 @@ void RowPainter::paintSelection() const
x += e.full_width(); x += e.full_width();
} }
if ((row_.begin_margin_sel && rtl) || (row_.end_margin_sel && !rtl)) if (rtl ? row_.begin_margin_sel : row_.end_margin_sel)
pi_.pain.fillRectangle(x, y1, int(xo_) + text_metrics_.width() - x, y2 - y1, pi_.pain.fillRectangle(x, y1, int(xo_) + text_metrics_.width() - x, y2 - y1,
Color_selection); Color_selection);