Changeset 232392 in webkit

Timestamp:

Jun 1, 2018 6:02:39 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Difficult to read combo box text in dark theme
​https://bugs.webkit.org/show_bug.cgi?id=165072

Patch by Carlos Eduardo Ramalho <​cadubentzen@gmail.com> on 2018-06-01
Reviewed by Carlos Garcia Campos.

Set listbox foreground color to theme color to fix hard-to-read
text color in combo box while using dark theme.

No new tests required. ManualTests/gtk/theme.html already covers it.
See the "Option Lists" section.

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::adjustStyle):
Adjust style for ListboxPart as well.

• rendering/RenderTheme.h: Add adjustListboxStyle()
• rendering/RenderThemeGtk.cpp:

(WebCore::RenderThemeGtk::adjustListboxStyle const):
Set color to the theme foreground color.

• rendering/RenderThemeGtk.h: adjustListboxStyle() overriden.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeGtk.cpp (modified) (1 diff)
• rendering/RenderThemeGtk.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-01  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [GTK] Difficult to read combo box text in dark theme
+        https://bugs.webkit.org/show_bug.cgi?id=165072
+
+        Reviewed by Carlos Garcia Campos.
+
+        Set listbox foreground color to theme color to fix hard-to-read
+        text color in combo box while using dark theme.
+
+        No new tests required. ManualTests/gtk/theme.html already covers it.
+        See the "Option Lists" section.
+
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::adjustStyle):
+        Adjust style for ListboxPart as well.
+        * rendering/RenderTheme.h: Add adjustListboxStyle()
+        * rendering/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::adjustListboxStyle const):
+        Set color to the theme foreground color.
+        * rendering/RenderThemeGtk.h: adjustListboxStyle() overriden.
+
 2018-06-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -214 +214 @@
     case MenulistButtonPart:
         return adjustMenuListButtonStyle(styleResolver, style, element);
+    case ListboxPart:
+        return adjustListboxStyle(styleResolver, style, element);
     case MediaPlayButtonPart:
     case MediaCurrentTimePart:

trunk/Source/WebCore/rendering/RenderTheme.h

@@ -305 +305 @@
     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, const Element*) const;
     virtual bool paintMenuListButtonDecorations(const RenderBox&, const PaintInfo&, const FloatRect&) { return true; }
+
+    virtual void adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const { };
 
     virtual bool paintPushButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }

trunk/Source/WebCore/rendering/RenderThemeGtk.cpp

@@ -1136 +1136 @@
 }
 
+void RenderThemeGtk::adjustListboxStyle(StyleResolver&, RenderStyle& style, const Element* element) const
+{
+    if (element)
+        style.setColor(styleColor(ListBox, element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, StyleColorForeground));
+}
+
 bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const FloatRect& r)
 {

trunk/Source/WebCore/rendering/RenderThemeGtk.h

@@ -134 +134 @@
     bool paintMenuListButtonDecorations(const RenderBox&, const PaintInfo&, const FloatRect&) override;
 
+    void adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const override;
+
     void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, const Element*) const override;
     bool paintSearchFieldResultsDecorationPart(const RenderBox&, const PaintInfo&, const IntRect&) override;