Changeset 94419 in webkit

Timestamp:

Sep 2, 2011 8:57:44 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: [Qt] number input not rendering spin buttons properly in RTL direction
​https://bugs.webkit.org/show_bug.cgi?id=67445

Properly render Qt's number input with RTL direction, and fix Plastique styling.

Patch by Jarred Nicholls <​jarred@sencha.com> on 2011-09-02
Reviewed by Andreas Kling.

• platform/qt/RenderThemeQt.cpp:

(WebCore::RenderThemeQt::paintInnerSpinButton):

LayoutTests: [Qt] number input not rendering spin buttons properly in RTL direction
​https://bugs.webkit.org/show_bug.cgi?id=67445

New baseline for Qt number input with RTL direction.

Patch by Jarred Nicholls <​jarred@sencha.com> on 2011-09-02
Reviewed by Andreas Kling.

• platform/qt/fast/forms/input-appearance-number-rtl-expected.png:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/fast/forms/input-appearance-number-rtl-expected.png (modified) (previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/qt/RenderThemeQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-02  Jarred Nicholls  <jarred@sencha.com>
+
+        [Qt] number input not rendering spin buttons properly in RTL direction
+        https://bugs.webkit.org/show_bug.cgi?id=67445
+        
+        New baseline for Qt number input with RTL direction.
+
+        Reviewed by Andreas Kling.
+
+        * platform/qt/fast/forms/input-appearance-number-rtl-expected.png:
+
 2011-09-02  Arko Saha  <nghq36@motorola.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-02  Jarred Nicholls  <jarred@sencha.com>
+
+        [Qt] number input not rendering spin buttons properly in RTL direction
+        https://bugs.webkit.org/show_bug.cgi?id=67445
+        
+        Properly render Qt's number input with RTL direction, and fix Plastique styling.
+
+        Reviewed by Andreas Kling.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintInnerSpinButton):
+
 2011-09-02  Arko Saha  <nghq36@motorola.com>
 

trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

@@ -77 +77 @@
 #include <QMacStyle>
 #include <QPainter>
+#include <QPlastiqueStyle>
 #include <QPushButton>
 #include <QStyleFactory>
@@ -1099 +1100 @@
         }
     }
+    // Render the spin buttons for LTR or RTL accordingly.
+    option.direction = o->style()->isLeftToRightDirection() ? Qt::LeftToRight : Qt::RightToLeft;
 
     IntRect buttonRect = rect;
-    buttonRect.inflateY(-2);
+    // Default to moving the buttons a little bit within the editor frame.
+    int inflateX = -2;
+    int inflateY = -2;
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
     // QMacStyle will position the aqua buttons flush to the right.
-    // This will move them more left for better style, a la
+    // This will move them more within the control for better style, a la
     // Chromium look & feel.
     if (qobject_cast<QMacStyle*>(p.style)) {
-        buttonRect.inflateX(-4);
+        inflateX = -4;
         // Render mini aqua spin buttons for QMacStyle to fit nicely into
         // the editor area, like Chromium.
         option.state |= QStyle::State_Mini;
-#else
-    {
-        buttonRect.inflateX(-2);
-#endif
-    }
+    }
+#endif
+#if defined(Q_WS_X11) && !defined(QT_NO_STYLE_PLASTIQUE)
+    // QPlastiqueStyle looks best when the spin buttons are flush with the frame's edge.
+    if (qobject_cast<QPlastiqueStyle*>(p.style)) {
+        inflateX = 0;
+        inflateY = 0;
+    }
+#endif
+
+    buttonRect.inflateX(inflateX);
+    buttonRect.inflateY(inflateY);
     option.rect = buttonRect;