[webkit-changes] [198007] releases/WebKitGTK/webkit-2.10/Source/WebCore

Fri, 11 Mar 2016 04:58:47 -0800

Title: [198007] releases/WebKitGTK/webkit-2.10/Source/WebCore
Revision
198007
Author
[email protected]
Date
2016-03-11 04:58:41 -0800 (Fri, 11 Mar 2016)

Log Message

Merge r197997 - [GTK] Scrollbars are broken once again with current GTK+ master
https://bugs.webkit.org/show_bug.cgi?id=155292

Reviewed by Michael Catanzaro.

Most of the trough theming properties have been moved to the
scrollbar, and a new gadget "contents" has been added between the
scrollbar and its children.

* platform/gtk/ScrollbarThemeGtk.cpp:
(WebCore::ScrollbarThemeGtk::getOrCreateStyleContext): Add
left/bottom style classes to ensure the scrollbars border is taken
into account and rendered.
(WebCore::ScrollbarThemeGtk::paintTrackBackground): Also create
style context for contents gadget.
(WebCore::ScrollbarThemeGtk::paintThumb): Ditto.
(WebCore::ScrollbarThemeGtk::paintButton): Ditto.
(WebCore::ScrollbarThemeGtk::scrollbarThickness): Take the
scrollbar border into account.
(WebCore::ScrollbarThemeGtk::buttonSize): Also create style
context for contents gadget.
(WebCore::ScrollbarThemeGtk::getStepperSpacing): Ditto.
(WebCore::ScrollbarThemeGtk::minimumThumbLength): Ditto.
(WebCore::ScrollbarThemeGtk::thumbFatness): Ditto.
(WebCore::ScrollbarThemeGtk::getTroughBorder): Take the scrollbar
border into account.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (198006 => 198007)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2016-03-11 12:58:28 UTC (rev 198006)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2016-03-11 12:58:41 UTC (rev 198007)
@@ -1,3 +1,32 @@
+2016-03-10  Carlos Garcia Campos  <[email protected]>
+
+        [GTK] Scrollbars are broken once again with current GTK+ master
+        https://bugs.webkit.org/show_bug.cgi?id=155292
+
+        Reviewed by Michael Catanzaro.
+
+        Most of the trough theming properties have been moved to the
+        scrollbar, and a new gadget "contents" has been added between the
+        scrollbar and its children.
+
+        * platform/gtk/ScrollbarThemeGtk.cpp:
+        (WebCore::ScrollbarThemeGtk::getOrCreateStyleContext): Add
+        left/bottom style classes to ensure the scrollbars border is taken
+        into account and rendered.
+        (WebCore::ScrollbarThemeGtk::paintTrackBackground): Also create
+        style context for contents gadget.
+        (WebCore::ScrollbarThemeGtk::paintThumb): Ditto.
+        (WebCore::ScrollbarThemeGtk::paintButton): Ditto.
+        (WebCore::ScrollbarThemeGtk::scrollbarThickness): Take the
+        scrollbar border into account.
+        (WebCore::ScrollbarThemeGtk::buttonSize): Also create style
+        context for contents gadget.
+        (WebCore::ScrollbarThemeGtk::getStepperSpacing): Ditto.
+        (WebCore::ScrollbarThemeGtk::minimumThumbLength): Ditto.
+        (WebCore::ScrollbarThemeGtk::thumbFatness): Ditto.
+        (WebCore::ScrollbarThemeGtk::getTroughBorder): Take the scrollbar
+        border into account.
+
 2016-03-04  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Scrollbars are broken again with GTK+ >= 3.19.11

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (198006 => 198007)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp	2016-03-11 12:58:28 UTC (rev 198006)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp	2016-03-11 12:58:41 UTC (rev 198007)
@@ -187,11 +187,6 @@
 }
 
 #ifndef GTK_API_VERSION_2
-static inline const char* orientationStyleClass(ScrollbarOrientation orientation)
-{
-    return orientation == VerticalScrollbar ? "vertical" : "horizontal";
-}
-
 GRefPtr<GtkStyleContext> ScrollbarThemeGtk::getOrCreateStyleContext(ScrollbarOrientation orientation)
 {
     if (m_cachedStyleContext)
@@ -205,7 +200,8 @@
 #else
     gtk_widget_path_iter_add_class(path.get(), -1, "scrollbar");
 #endif
-    gtk_widget_path_iter_add_class(path.get(), -1, orientationStyleClass(orientation));
+    gtk_widget_path_iter_add_class(path.get(), -1, orientation == VerticalScrollbar ? "vertical" : "horizontal");
+    gtk_widget_path_iter_add_class(path.get(), -1, orientation == VerticalScrollbar ? "right" : "bottom");
     gtk_style_context_set_path(styleContext.get(), path.get());
 
     return styleContext;
@@ -298,10 +294,22 @@
     if (troughUnderSteppers(scrollbar))
         fullScrollbarRect = IntRect(scrollbar.x(), scrollbar.y(), scrollbar.width(), scrollbar.height());
 
-    GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(parentStyleContext.get(), "trough");
-    adjustRectAccordingToMargin(styleContext.get(), fullScrollbarRect);
-    gtk_render_background(styleContext.get(), context.platformContext()->cr(), fullScrollbarRect.x(), fullScrollbarRect.y(), fullScrollbarRect.width(), fullScrollbarRect.height());
-    gtk_render_frame(styleContext.get(), context.platformContext()->cr(), fullScrollbarRect.x(), fullScrollbarRect.y(), fullScrollbarRect.width(), fullScrollbarRect.height());
+    IntRect adjustedRect = fullScrollbarRect;
+    adjustRectAccordingToMargin(parentStyleContext.get(), adjustedRect);
+    gtk_render_background(parentStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+    gtk_render_frame(parentStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(parentStyleContext.get(), "contents");
+    adjustedRect = fullScrollbarRect;
+    adjustRectAccordingToMargin(contentsStyleContext.get(), adjustedRect);
+    gtk_render_background(contentsStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+    gtk_render_frame(contentsStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+
+    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
+    adjustedRect = fullScrollbarRect;
+    adjustRectAccordingToMargin(troughStyleContext.get(), adjustedRect);
+    gtk_render_background(troughStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+    gtk_render_frame(troughStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
 }
 
 void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext& context, Scrollbar& scrollbar)
@@ -314,7 +322,8 @@
 {
     ScrollbarOrientation orientation = scrollbar.orientation();
     GRefPtr<GtkStyleContext> parentStyleContext = getOrCreateStyleContext(orientation);
-    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(parentStyleContext.get(), "trough");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(parentStyleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
     GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(troughStyleContext.get(), "slider");
 
     unsigned flags = 0;
@@ -334,7 +343,8 @@
 {
     ScrollbarOrientation orientation = scrollbar.orientation();
     GRefPtr<GtkStyleContext> parentStyleContext = getOrCreateStyleContext(orientation);
-    GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(parentStyleContext.get(), "button");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(parentStyleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(contentsStyleContext.get(), "button");
 
     unsigned flags = 0;
     if ((BackButtonStartPart == part && scrollbar.currentPos())
@@ -454,10 +464,18 @@
 {
     GtkBorder troughBorder;
 #if GTK_CHECK_VERSION(3, 19, 11)
-    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext, "trough");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext, "contents");
+    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
     GRefPtr<GtkStyleContext> sliderStyleContext = createChildStyleContext(troughStyleContext.get(), "slider");
     int thumbFat = thumbFatness(sliderStyleContext.get(), orientation);
     getTroughBorder(troughStyleContext.get(), &troughBorder);
+    // Since GTK+ 3.19 the scrollbar can have its own border too.
+    GtkBorder border;
+    gtk_style_context_get_border(styleContext, gtk_style_context_get_state(styleContext), &border);
+    troughBorder.left += border.left;
+    troughBorder.right += border.right;
+    troughBorder.top += border.top;
+    troughBorder.bottom += border.bottom;
 #else
     int thumbFat = thumbFatness(styleContext, orientation);
     getTroughBorder(styleContext, &troughBorder);
@@ -477,7 +495,8 @@
 {
     GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
 #if GTK_CHECK_VERSION(3, 19, 11)
-    GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(styleContext.get(), "button");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(contentsStyleContext.get(), "button");
     switch (buttonPart) {
     case BackButtonStartPart:
     case ForwardButtonStartPart:
@@ -516,7 +535,8 @@
 {
     GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
 #if GTK_CHECK_VERSION(3, 19, 11)
-    GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(styleContext.get(), "button");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(contentsStyleContext.get(), "button");
     switch (buttonPart) {
     case BackButtonStartPart:
     case ForwardButtonStartPart:
@@ -556,7 +576,8 @@
     GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
     int minThumbLength = 0;
 #if GTK_CHECK_VERSION(3, 19, 11)
-    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext.get(), "trough");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
     GRefPtr<GtkStyleContext> sliderStyleContext = createChildStyleContext(troughStyleContext.get(), "slider");
     gtk_style_context_get(sliderStyleContext.get(), gtk_style_context_get_state(sliderStyleContext.get()),
         scrollbar.orientation() == VerticalScrollbar ? "min-height" : "min-width", &minThumbLength, nullptr);
@@ -591,7 +612,8 @@
 {
     GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
 #if GTK_CHECK_VERSION(3, 19, 11)
-    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext.get(), "trough");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
     GRefPtr<GtkStyleContext> sliderStyleContext = createChildStyleContext(troughStyleContext.get(), "slider");
     return thumbFatness(sliderStyleContext.get(), scrollbar.orientation());
 #else
@@ -614,8 +636,16 @@
 {
     GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
 #if GTK_CHECK_VERSION(3, 19, 11)
-    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext.get(), "trough");
+    GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+    GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
     getTroughBorder(troughStyleContext.get(), border);
+    // Since GTK+ 3.19 the scrollbar can have its own border too.
+    GtkBorder scrollbarBorder;
+    gtk_style_context_get_border(styleContext.get(), gtk_style_context_get_state(styleContext.get()), &scrollbarBorder);
+    border->left += scrollbarBorder.left;
+    border->right += scrollbarBorder.right;
+    border->top += scrollbarBorder.top;
+    border->bottom += scrollbarBorder.bottom;
 #else
     getTroughBorder(styleContext.get(), border);
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to