bug 1322120 use text node for field and selected colors r?stransky draft
authorKarl Tomlinson <karlt+@karlt.net>
Thu, 08 Dec 2016 10:39:36 -1000
changeset 447966 1a721cfc9f0696790092c726b0279a92368a8997
parent 447934 d8f63b2935af0915a6a24b3ea8e27d9a09f66416
child 539180 81a40dcad077934454e2d2c75e3d43638d8e5af9
push id38223
push userktomlinson@mozilla.com
push dateThu, 08 Dec 2016 20:45:39 +0000
reviewersstransky
bugs1322120
milestone53.0a1
bug 1322120 use text node for field and selected colors r?stransky This adjustment is required for changes to MOZ_GTK_TEXT_VIEW in a6aabcb07a6e. MOZ_GTK_TEXT_VIEW_TEXT now retrieves the equivalent node from WidgetStyleCache. MozReview-Commit-ID: 2zfHCKMT0ov
widget/gtk/nsLookAndFeel.cpp
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -1279,17 +1279,17 @@ nsLookAndFeel::Init()
         sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
         sFrameOuterLightBorder =
             GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]);
         sFrameInnerDarkBorder =
             GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);
     }
 #else
     // Text colors
-    style = ClaimStyleContext(MOZ_GTK_TEXT_VIEW);
+    style = ClaimStyleContext(MOZ_GTK_TEXT_VIEW_TEXT);
     gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
     sMozFieldBackground = GDK_RGBA_TO_NS_RGBA(color);
     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
     sMozFieldText = GDK_RGBA_TO_NS_RGBA(color);
 
     // Selected text and background
     gtk_style_context_get_background_color(style,
         static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED),