summaryrefslogtreecommitdiff
path: root/debian/patches/0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d.diff
blob: 5e3195cc8b1589b484adff4466e97b53c60532d8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
This is expected to be in 4.4.2


From: Tor Arne Vestbø <tavestbo@trolltech.com>
Date: Tue, 10 Jun 2008 16:04:06 +0000 (+0200)
Subject: Fill the background of scrollbars to the window color before
X-Git-Url: http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=commitdiff_plain;h=5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d

Fill the background of scrollbars to the window color before
letting the QStyle paint its primitive elements.

Signed-off-by: Simon
---

+2008-06-10  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon
+
+        Fill the background of scrollbars to the window color before
+        letting the QStyle paint its primitive elements.
+
+        * platform/qt/PlatformScrollBarQt.cpp:
+        (WebCore::PlatformScrollbar::paint):
+
 2008-05-30  Adam Treat  <treat@kde.org>
 
         Reviewed by Simon.
diff --git a/WebCore/platform/qt/PlatformScrollBarQt.cpp b/WebCore/platform/qt/PlatformScrollBarQt.cpp
index 66063eb..c7f5bdd 100644
--- a/src/3rdparty/webkit/WebCore/platform/qt/PlatformScrollBarQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/qt/PlatformScrollBarQt.cpp
@@ -183,6 +183,10 @@ void PlatformScrollbar::paint(GraphicsContext* graphicsContext, const IntRect& d
 #else
     p->translate(topLeft);
     m_opt.rect.moveTo(QPoint(0, 0));
+
+    // The QStyle expects the background to be already filled
+    p->fillRect(m_opt.rect, m_opt.palette.background());
+
     QApplication::style()->drawComplexControl(QStyle::CC_ScrollBar, &m_opt, p, 0);
     m_opt.rect.moveTo(topLeft);
 #endif