Changeset 37585

Timestamp:

10/14/08 05:50:51 (17 months ago)

Author:

vestbo@webkit.org

Message:

2008-10-14 Tor Arne Vestbø < tavestbo@trolltech.com>

Reviewed by Simon.

Fix QtWebKit scrollbar painting errors

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/ScrollbarThemeQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-14  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+        
+        Fix QtWebKit scrollbar painting errors
+
+        * platform/qt/ScrollbarThemeQt.cpp:
+        (WebCore::ScrollbarThemeQt::paint):
+        (WebCore::ScrollbarThemeQt::paintScrollCorner):
+
 2008-10-14  Tor Arne Vestbø  <tavestbo@trolltech.com>
 

trunk/WebCore/platform/qt/ScrollbarThemeQt.cpp

@@ -139 +139 @@
       return true;
 
+    p.painter->save();
     QStyleOptionSlider* opt = styleOptionSlider(scrollbar);
     p.painter->setClipRect(opt->rect.intersected(damageRect));
@@ -155 +156 @@
     opt->rect.moveTo(topLeft);
 #endif
+    p.painter->restore();
 
     return true;
@@ -229 +231 @@
     context->fillRect(rect, QApplication::palette().color(QPalette::Normal, QPalette::Window));
 #else
+    StylePainter p(context);
+    if (!p.isValid())
+        return;
+
     QStyleOption option;
     option.rect = rect;
-    QApplication::style()->drawPrimitive(QStyle::PE_PanelScrollAreaCorner,
-            &option, context->platformContext(), 0);
+    p.drawPrimitive(QStyle::PE_PanelScrollAreaCorner, option);
 #endif
 }