From 20c9b985f1727402dc96c2e9d8a4a2f6d8a121db Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Thu, 1 Mar 2012 10:12:25 +1100
Subject: Bug #3494492. Change aveCharWidth in FontMeasurements to actually
 store fractional width. This change complements change set 3994.

Make WidthText() and AverageCharWidth() actually return fractional widths
under Direct2D.

From Marko Njezic.
---
 src/Editor.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Editor.cxx')

diff --git a/src/Editor.cxx b/src/Editor.cxx
index bb5813686..421f33220 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1947,8 +1947,8 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 					}
 					PRectangle rcNumber = rcMarker;
 					// Right justify
-					int width = surface->WidthText(vs.styles[STYLE_LINENUMBER].font, number, istrlen(number));
-					int xpos = rcNumber.right - width - 3;
+					XYPOSITION width = surface->WidthText(vs.styles[STYLE_LINENUMBER].font, number, istrlen(number));
+					XYPOSITION xpos = rcNumber.right - width - 3;
 					rcNumber.left = xpos;
 					surface->DrawTextNoClip(rcNumber, vs.styles[STYLE_LINENUMBER].font,
 					        rcNumber.top + vs.maxAscent, number, istrlen(number),
-- 
cgit v1.2.3