X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.cpp;h=4c9118d916fe37698c75778f92bca8efd68fe457;hb=390ae05444cf4899a3028dcbbfe1095ecd2d207a;hp=5e3444abb383ad5ee119a9dc760930c0f14f906a;hpb=52236503d3f680a2df00a6e6539b530703066d32;p=lyx.git

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 5e3444abb3..4c9118d916 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -83,7 +83,7 @@ RowPainter::RowPainter(PainterInfo & pi,
 		dotted_line_offset_ = int(0.5 * dotted_line_thickness_) + 1;
 	}
 
-	x_ = row_.x + xo_;
+	x_ = row_.left_margin + xo_;
 
 	//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
 	//row_.dump();
@@ -183,7 +183,7 @@ void RowPainter::paintChars(pos_type & vpos, Font const & font)
 	for (++vpos ; vpos < end ; ++vpos) {
 		pos = bidi_.vis2log(vpos);
 
-		if (!font_span.inside(pos))
+		if (!font_span.contains(pos))
 			break;
 
 		bool const new_spell_state =
@@ -442,16 +442,16 @@ int RowPainter::paintAppendixStart(int y)
 void RowPainter::paintTooLargeMarks(bool const left, bool const right)
 {
 	if (left)
-		pi_.pain.line(dotted_line_thickness_, yo_ - row_.ascent(),
-			      dotted_line_thickness_, yo_ + row_.descent(),
-			      Color_scroll,
-			      Painter::line_onoffdash, dotted_line_thickness_);
+		pi_.pain.line(int(dotted_line_thickness_), yo_ - row_.ascent(),
+					  int(dotted_line_thickness_), yo_ + row_.descent(),
+					  Color_scroll,
+					  Painter::line_onoffdash, dotted_line_thickness_);
 	if (right) {
-		int const wwidth = pi_.base.bv->workWidth() - dotted_line_thickness_;
+		int const wwidth = pi_.base.bv->workWidth() - int(dotted_line_thickness_);
 		pi_.pain.line(wwidth, yo_ - row_.ascent(),
-			      wwidth, yo_ + row_.descent(),
-			      Color_scroll,
-			      Painter::line_onoffdash, dotted_line_thickness_);
+					  wwidth, yo_ + row_.descent(),
+					  Color_scroll,
+					  Painter::line_onoffdash, dotted_line_thickness_);
 	}
 }
 
@@ -753,13 +753,13 @@ void RowPainter::paintText()
 		}
 
 		// Use font span to speed things up, see above
-		if (!font_span.inside(pos)) {
+		if (!font_span.contains(pos)) {
 			font_span = par_.fontSpan(pos);
 			font = text_metrics_.displayFont(pit_, pos);
 
 			// split font span if inline completion is inside
 			if (inlineCompletionVPos != -1
-			    && font_span.inside(inlineCompletionPos.pos()))
+			    && font_span.contains(inlineCompletionPos.pos()))
 				font_span.last = inlineCompletionPos.pos();
 		}