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

Convert a few more variables to int

Browse Source 
This avoids warnings with windows compiler. It is a pity that even
clang does not give those. Maybe I missed them with the large amount
of boost warnings that it spits.
This commit is contained in:
Jean-Marc Lasgouttes 2015-07-15 10:16:42 +02:00
parent a05b8be4bf
commit 1136bc4fb2
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

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