Changeset 199659 in webkit

Timestamp:

Apr 18, 2016 1:44:55 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Menu list button doesn't use the text color from the theme
​https://bugs.webkit.org/show_bug.cgi?id=118234

Reviewed by Darin Adler.

.:

• ManualTests/gtk/theme.html: Add a disabled combo test.

Source/WebCore:

Set the combo box color accroding to the theme when adjusting the menu list style like Mac port does.

• rendering/RenderThemeGtk.cpp:

(WebCore::menuListColor):
(WebCore::RenderThemeGtk::adjustMenuListStyle):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/gtk/theme.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeGtk.cpp (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2016-04-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Menu list button doesn't use the text color from the theme
+        https://bugs.webkit.org/show_bug.cgi?id=118234
+
+        Reviewed by Darin Adler.
+
+        * ManualTests/gtk/theme.html: Add a disabled combo test.
+
 2016-04-13  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/ManualTests/gtk/theme.html

@@ -38 +38 @@
       <td><select><option>A</option><option selected>B</option><option>C</option></td>
       <td><select><option>Combo option 1</option><option>Combo option 2</option><option>Combo option 3</option></td>
+      <td><select disabled><option>Disabled option 1</option><option>Disabled option 2</option><option>Disabled option 3</option></td>
     </tr>
   </table>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Menu list button doesn't use the text color from the theme
+        https://bugs.webkit.org/show_bug.cgi?id=118234
+
+        Reviewed by Darin Adler.
+
+        Set the combo box color accroding to the theme when adjusting the menu list style like Mac port does.
+
+        * rendering/RenderThemeGtk.cpp:
+        (WebCore::menuListColor):
+        (WebCore::RenderThemeGtk::adjustMenuListStyle):
+
 2016-04-18  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebCore/rendering/RenderThemeGtk.cpp

@@ -774 +774 @@
 #endif // GTK_CHECK_VERSION(3, 20, 0)
 
-void RenderThemeGtk::adjustMenuListStyle(StyleResolver&, RenderStyle& style, const Element*) const
+static Color menuListColor(const Element* element)
+{
+#if GTK_CHECK_VERSION(3, 20, 0)
+    RenderThemeGadget::Info info { RenderThemeGadget::Type::Generic, "combobox", element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, { } };
+    auto comboGadget = RenderThemeGadget::create(info);
+    Vector<RenderThemeGadget::Info> children {
+        { RenderThemeGadget::Type::Generic, "button", info.state, { "combo" } }
+    };
+    info.name = "box";
+    info.classList = { "horizontal", "linked" };
+    return RenderThemeBoxGadget(info, children, comboGadget.get()).child(0)->color();
+#else
+    GRefPtr<GtkStyleContext> parentStyleContext = createStyleContext(ComboBox);
+    GRefPtr<GtkStyleContext> buttonStyleContext = createStyleContext(ComboBoxButton, parentStyleContext.get());
+    gtk_style_context_set_state(buttonStyleContext.get(), element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL);
+
+    GdkRGBA gdkRGBAColor;
+    gtk_style_context_get_color(buttonStyleContext.get(), gtk_style_context_get_state(buttonStyleContext.get()), &gdkRGBAColor);
+    return gdkRGBAColor;
+#endif // GTK_CHECK_VERSION(3, 20, 0)
+}
+
+void RenderThemeGtk::adjustMenuListStyle(StyleResolver&, RenderStyle& style, const Element* element) const
 {
     // The tests check explicitly that select menu buttons ignore line height.
@@ -781 +803 @@
     // We cannot give a proper rendering when border radius is active, unfortunately.
     style.resetBorderRadius();
+
+    style.setColor(menuListColor(element));
 }