Changeset 102589 in webkit

Timestamp:

Dec 12, 2011 8:44:31 AM (12 years ago)

Author:

pierre.rossi@gmail.com

Message:

[Qt] Rendering issues with sliders and QStyle
​https://bugs.webkit.org/show_bug.cgi?id=73921

With QStyle's origins being deeply rooted with widgets,
several styles make wrong assumptions, leading to sliders
not being painted properly in WebKit. We can solve a lot
of problems by systematically translating the painter to
the top left corner of the render object.

Reviewed by Simon Hausmann.

No new tests. The Qt tests are ran with the Windows
style, this fixes some quirks affecting other styles.

• platform/qt/RenderThemeQStyle.cpp:

(WebCore::RenderThemeQStyle::paintSliderTrack):
(WebCore::RenderThemeQStyle::paintSliderThumb):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/RenderThemeQStyle.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  Pierre Rossi  <pierre.rossi@gmail.com>
+
+        [Qt] Rendering issues with sliders and QStyle
+        https://bugs.webkit.org/show_bug.cgi?id=73921
+
+        With QStyle's origins being deeply rooted with widgets,
+        several styles make wrong assumptions, leading to sliders
+        not being painted properly in WebKit. We can solve a lot
+        of problems by systematically translating the painter to
+        the top left corner of the render object.
+
+        Reviewed by Simon Hausmann.
+
+        No new tests. The Qt tests are ran with the Windows
+        style, this fixes some quirks affecting other styles.
+
+        * platform/qt/RenderThemeQStyle.cpp:
+        (WebCore::RenderThemeQStyle::paintSliderTrack):
+        (WebCore::RenderThemeQStyle::paintSliderThumb):
+
 2011-12-12  Mary Wu  <mary.wu@torchmobile.com.cn>
 

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

@@ -65 +65 @@
 #include <QMacStyle>
 #include <QPainter>
+#ifndef QT_NO_STYLE_PLASTIQUE
 #include <QPlastiqueStyle>
+#endif
 #include <QPushButton>
 #include <QStyleFactory>
@@ -557 +559 @@
         return true;
 
+    const QPoint topLeft = r.location();
+    p.painter->translate(topLeft);
+
     QStyleOptionSlider option;
     initStyleOption(p.widget, option);
@@ -562 +567 @@
     ControlPart appearance = initializeCommonQStyleOptions(option, o);
     option.rect = r;
+    option.rect.moveTo(QPoint(0, 0));
     if (appearance == SliderVerticalPart)
         option.orientation = Qt::Vertical;
@@ -567 +573 @@
         option.state |= QStyle::State_Sunken;
 
+    // some styles need this to show a highlight on one side of the groove
+    HTMLInputElement* slider = o->node()->toInputElement();
+    if (slider) {
+        option.upsideDown = (appearance == SliderHorizontalPart) && !o->style()->isLeftToRightDirection();
+        // Use the width as a multiplier in case the slider values are <= 1
+        const int width = r.width() > 0 ? r.width() : 100;
+        option.maximum = slider->maximum() * width;
+        option.minimum = slider->minimum() * width;
+        if (!option.upsideDown)
+            option.sliderPosition = slider->valueAsNumber() * width;
+        else
+            option.sliderPosition = option.minimum + option.maximum - slider->valueAsNumber() * width;
+    }
+
     p.drawComplexControl(QStyle::CC_Slider, option);
 
@@ -574 +594 @@
         p.drawPrimitive(QStyle::PE_FrameFocusRect, focusOption);
     }
-
+    p.painter->translate(-topLeft);
     return false;
 }
@@ -589 +609 @@
     if (!p.isValid())
         return true;
+
+    const QPoint topLeft = r.location();
+    p.painter->translate(topLeft);
 
     QStyleOptionSlider option;
@@ -595 +618 @@
     ControlPart appearance = initializeCommonQStyleOptions(option, o);
     option.rect = r;
+    option.rect.moveTo(QPoint(0, 0));
     if (appearance == SliderThumbVerticalPart)
         option.orientation = Qt::Vertical;
@@ -603 +627 @@
 
     p.drawComplexControl(QStyle::CC_Slider, option);
-
+    p.painter->translate(-topLeft);
     return false;
 }