wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-29 02:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

[GTK3] Use WidgetCache to get colors at nsLookAndFeelfor menuitems, text and tree view

Browse source
This commit is contained in:
trav90 2018-04-06 09:04:54 -05:00 • committed by Roy Tam
commit f0e2977c10
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
widget/gtk/nsLookAndFeel.cpp
View file

@ -1168,18 +1168,20 @@ nsLookAndFeel::Init()
sMenuText = GDK_RGBA_TO_NS_RGBA(color); sMenuText = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_get_color(style, GTK_STATE_FLAG_INSENSITIVE, &color); gtk_style_context_get_color(style, GTK_STATE_FLAG_INSENSITIVE, &color);
sMenuTextInactive = GDK_RGBA_TO_NS_RGBA(color); sMenuTextInactive = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(menu);
style = gtk_widget_get_style_context(menu); style = ClaimStyleContext(MOZ_GTK_MENUPOPUP);
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
sMenuBackground = GDK_RGBA_TO_NS_RGBA(color); sMenuBackground = GDK_RGBA_TO_NS_RGBA(color);
ReleaseStyleContext(style);
style = gtk_widget_get_style_context(menuitem); style = ClaimStyleContext(MOZ_GTK_MENUITEM);
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_PRELIGHT, &color); gtk_style_context_get_background_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
sMenuHover = GDK_RGBA_TO_NS_RGBA(color); sMenuHover = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color); gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
sMenuHoverText = GDK_RGBA_TO_NS_RGBA(color); sMenuHoverText = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(menu); ReleaseStyleContext(style);
#endif #endif
// button styles // button styles
@ -1289,9 +1291,7 @@ nsLookAndFeel::Init()
} }
#else #else
// Text colors // Text colors
style = gtk_widget_get_style_context(textView); style = ClaimStyleContext(MOZ_GTK_TEXT_VIEW);
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_VIEW);
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
sMozFieldBackground = GDK_RGBA_TO_NS_RGBA(color); sMozFieldBackground = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
@ -1306,7 +1306,7 @@ nsLookAndFeel::Init()
static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED), static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED),
&color); &color);
sTextSelectedText = GDK_RGBA_TO_NS_RGBA(color); sTextSelectedText = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_restore(style); ReleaseStyleContext(style);
// Button text, background, border // Button text, background, border
style = gtk_widget_get_style_context(label); style = gtk_widget_get_style_context(label);
@ -1321,11 +1321,12 @@ nsLookAndFeel::Init()
sComboBoxText = GDK_RGBA_TO_NS_RGBA(color); sComboBoxText = GDK_RGBA_TO_NS_RGBA(color);
// Menubar text and hover text colors // Menubar text and hover text colors
style = gtk_widget_get_style_context(menuBarItem); style = ClaimStyleContext(MOZ_GTK_MENUBARITEM);
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
sMenuBarText = GDK_RGBA_TO_NS_RGBA(color); sMenuBarText = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color); gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
sMenuBarHoverText = GDK_RGBA_TO_NS_RGBA(color); sMenuBarHoverText = GDK_RGBA_TO_NS_RGBA(color);
ReleaseStyleContext(style);
// GTK's guide to fancy odd row background colors: // GTK's guide to fancy odd row background colors:
// 1) Check if a theme explicitly defines an odd row color // 1) Check if a theme explicitly defines an odd row color
@ -1333,7 +1334,7 @@ nsLookAndFeel::Init()
// slightly by a hardcoded value (gtkstyle.c) // slightly by a hardcoded value (gtkstyle.c)
// 3) If neither are defined, take the base background color and // 3) If neither are defined, take the base background color and
// darken that by a hardcoded value // darken that by a hardcoded value
style = gtk_widget_get_style_context(treeView); style = ClaimStyleContext(MOZ_GTK_TREEVIEW);
// Get odd row background color // Get odd row background color
gtk_style_context_save(style); gtk_style_context_save(style);
@ -1341,6 +1342,7 @@ nsLookAndFeel::Init()
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color); sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_restore(style); gtk_style_context_restore(style);
ReleaseStyleContext(style);
// GtkFrame has a "border" subnode on which Adwaita draws the border. // GtkFrame has a "border" subnode on which Adwaita draws the border.
// Some themes do not draw on this node but draw a border on the widget // Some themes do not draw on this node but draw a border on the widget