Changeset 61445 in webkit

Timestamp:

Jun 18, 2010 3:11:14 PM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Text spacing miscalculation when using wordSpacing.
​https://bugs.webkit.org/show_bug.cgi?id=40483

Patch by Ananth Jasty <​ext-ananth.jasty@nokia.com> on 2010-06-18
Reviewed by Simon Hausmann.

Removed wordSpacing compensation in FontQt whitespace width
calculation. The QFontMetrics::width() overload that takes
a character does not take QFont's word spacing into account.

• platform/graphics/qt/FontQt.cpp:

(WebCore::Font::floatWidthForComplexText):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-18  Ananth Jasty  <ext-ananth.jasty@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Text spacing miscalculation when using wordSpacing.
+        https://bugs.webkit.org/show_bug.cgi?id=40483
+
+        Removed wordSpacing compensation in FontQt whitespace width
+        calculation. The QFontMetrics::width() overload that takes
+        a character does not take QFont's word spacing into account.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::floatWidthForComplexText):
+
 2010-06-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/platform/graphics/qt/FontQt.cpp

@@ -235 +235 @@
 
     if (run.length() == 1 && treatAsSpace(run[0]))
-        return QFontMetrics(font()).width(run[0]) - m_wordSpacing + run.padding();
+        return QFontMetrics(font()).width(run[0]) + run.padding();
 
     String sanitized = Font::normalizeSpaces(String(run.characters(), run.length()));