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

*rowpainter.cpp: Squeeze warnings.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37919 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-03-13 21:06:16 +00:00
parent 69ab57ab89
commit 6cb775b134
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rowpainter.cpp
View File

@ -378,10 +378,10 @@ void RowPainter::paintMisspelledMark(double orig_x, bool changed)
{ {
// if changed the misspelled marker gets placed slightly lower than normal // if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset // to avoid drawing at the same vertical offset
int const y = yo_ + solid_line_offset_ + solid_line_thickness_ float const y = yo_ + solid_line_offset_ + solid_line_thickness_
+ (changed ? solid_line_thickness_ + 1 : 0) + (changed ? solid_line_thickness_ + 1 : 0)
+ dotted_line_offset_; + dotted_line_offset_;
pi_.pain.line(int(orig_x), y, int(x_), y, Color_error, pi_.pain.line(int(orig_x), int(y), int(x_), int(y), Color_error,
Painter::line_onoffdash, dotted_line_thickness_); Painter::line_onoffdash, dotted_line_thickness_);
} }
@ -893,9 +893,9 @@ void RowPainter::paintText()
// Calculate 1/3 height of the buffer's default font // Calculate 1/3 height of the buffer's default font
FontMetrics const & fm FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont()); = theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const y_bar = change_running.deleted() ? float const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_; yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar, pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
change_running.color(), Painter::line_solid, solid_line_thickness_); change_running.color(), Painter::line_solid, solid_line_thickness_);
// Change might continue with a different author or type // Change might continue with a different author or type
@ -953,9 +953,9 @@ void RowPainter::paintText()
if (change_running.changed()) { if (change_running.changed()) {
FontMetrics const & fm FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont()); = theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const y_bar = change_running.deleted() ? float const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_; yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar, pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
change_running.color(), Painter::line_solid, solid_line_thickness_); change_running.color(), Painter::line_solid, solid_line_thickness_);
change_running.setUnchanged(); change_running.setUnchanged();
} }