Changeset 69119 in webkit

Timestamp:

Oct 5, 2010 10:03:12 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-10-05 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Interior scrollbars do not draw their background properly
​https://bugs.webkit.org/show_bug.cgi?id=47096

Correct the method that the GTK+ theme drawing code uses to
draw scrolled window backgrounds. Now it uses gtk_paint_shadow,
the same as the actual code from GTK+.

No new tests as this is very hard to write tests for. The bug only
manifests on some GTK+ themes and we have no test harness mechanism
for testing rendering with non-default GTK+ themes.

• platform/gtk/ScrollbarThemeGtk.cpp: (WebCore::ScrollbarThemeGtk::paintScrollbarBackground): No longer initialize the widget state, as it's unused by the callee. (WebCore::ScrollbarThemeGtk::paint): Remove an inaccurate comment.
• platform/gtk/gtk2drawing.c: (moz_gtk_scrolled_window_paint): Paint scrolled window backgrounds with gtk_paint_shadow instead of gtk_paint_box.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/ScrollbarThemeGtk.cpp (modified) (2 diffs)
• platform/gtk/gtk2drawing.c (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Interior scrollbars do not draw their background properly
+        https://bugs.webkit.org/show_bug.cgi?id=47096
+
+        Correct the method that the GTK+ theme drawing code uses to
+        draw scrolled window backgrounds. Now it uses gtk_paint_shadow,
+        the same as the actual code from GTK+.
+
+        No new tests as this is very hard to write tests for. The bug only
+        manifests on some GTK+ themes and we have no test harness mechanism
+        for testing rendering with non-default GTK+ themes.
+
+        * platform/gtk/ScrollbarThemeGtk.cpp:
+        (WebCore::ScrollbarThemeGtk::paintScrollbarBackground): No longer
+        initialize the widget state, as it's unused by the callee.
+        (WebCore::ScrollbarThemeGtk::paint): Remove an inaccurate comment.
+        * platform/gtk/gtk2drawing.c:
+        (moz_gtk_scrolled_window_paint): Paint scrolled window backgrounds
+        with gtk_paint_shadow instead of gtk_paint_box.
+
 2010-10-05  Kwang Yul Seo  <skyul@company100.net>
 

trunk/WebCore/platform/gtk/ScrollbarThemeGtk.cpp

@@ -222 +222 @@
 void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext* context, Scrollbar* scrollbar)
 {
+    // This is unused by the moz_gtk_scrollecd_window_paint.
     GtkWidgetState state;
-    state.focused = FALSE;
-    state.isDefault = FALSE;
-    state.canDefault = FALSE;
-    state.disabled = FALSE;
-    state.active = TRUE;
-    state.inHover = FALSE;
-
     IntRect fullScrollbarRect = IntRect(scrollbar->x(), scrollbar->y(), scrollbar->width(), scrollbar->height());
     static_cast<RenderThemeGtk*>(RenderTheme::defaultTheme().get())->paintMozillaGtkWidget(MOZ_GTK_SCROLLED_WINDOW, context, fullScrollbarRect, &state, 0);
@@ -304 +298 @@
     }
 
-    // Paint the scrollbar background (only used by custom CSS scrollbars).
     paintScrollbarBackground(graphicsContext, scrollbar);
 

trunk/WebCore/platform/gtk/gtk2drawing.c

@@ -1099 +1099 @@
                               GdkRectangle* cliprect, GtkWidgetState* state)
 {
-    GtkStateType state_type = ConvertGtkState(state);
-    GtkShadowType shadow_type = (state->active) ?  GTK_SHADOW_IN : GTK_SHADOW_OUT;
     GtkStyle* style;
     GtkAllocation allocation;
@@ -1117 +1115 @@
     style = gtk_widget_get_style(widget);
     TSOffsetStyleGCs(style, rect->x - 1, rect->y - 1);
-    gtk_paint_box(style, drawable, state_type, shadow_type, cliprect,
-                  widget, "scrolled_window", rect->x - 1, rect->y - 1,
-                  rect->width + 2, rect->height + 2);
+    gtk_paint_shadow(style, drawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+                     cliprect, gParts->scrolledWindowWidget, "scrolled_window",
+                     rect->x, rect->y, rect->width, rect->height);
     return MOZ_GTK_SUCCESS;
 }