<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199659] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199659">199659</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-18 01:44:55 -0700 (Mon, 18 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkManualTestsgtkthemehtml">trunk/ManualTests/gtk/theme.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (199658 => 199659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-04-18 08:31:11 UTC (rev 199658)
+++ trunk/ChangeLog 2016-04-18 08:44:55 UTC (rev 199659)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-04-13 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> FindWebP should not be misguided by pkg-config when cross-compiling.
</span></span></pre></div>
<a id="trunkManualTestsgtkthemehtml"></a>
<div class="modfile"><h4>Modified: trunk/ManualTests/gtk/theme.html (199658 => 199659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/gtk/theme.html 2016-04-18 08:31:11 UTC (rev 199658)
+++ trunk/ManualTests/gtk/theme.html 2016-04-18 08:44:55 UTC (rev 199659)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <td><select><option>A</option><option selected>B</option><option>C</option></td>
</span><span class="cx"> <td><select><option>Combo option 1</option><option>Combo option 2</option><option>Combo option 3</option></td>
</span><ins>+ <td><select disabled><option>Disabled option 1</option><option>Disabled option 2</option><option>Disabled option 3</option></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199658 => 199659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-18 08:31:11 UTC (rev 199658)
+++ trunk/Source/WebCore/ChangeLog 2016-04-18 08:44:55 UTC (rev 199659)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-04-18 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix positioned items with content alignment
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (199658 => 199659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-18 08:31:11 UTC (rev 199658)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-18 08:44:55 UTC (rev 199659)
</span><span class="lines">@@ -773,13 +773,37 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // GTK_CHECK_VERSION(3, 20, 0)
</span><span class="cx">
</span><del>-void RenderThemeGtk::adjustMenuListStyle(StyleResolver&, RenderStyle& style, const Element*) const
</del><ins>+static Color menuListColor(const Element* element)
</ins><span class="cx"> {
</span><ins>+#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
+{
</ins><span class="cx"> // The tests check explicitly that select menu buttons ignore line height.
</span><span class="cx"> style.setLineHeight(RenderStyle::initialLineHeight());
</span><span class="cx">
</span><span class="cx"> // We cannot give a proper rendering when border radius is active, unfortunately.
</span><span class="cx"> style.resetBorderRadius();
</span><ins>+
+ style.setColor(menuListColor(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderThemeGtk::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, const Element* e) const
</span></span></pre>
</div>
</div>
</body>
</html>