wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1161056 - Gtk3 - use sMozWindowBackground colors for combobox background. r=karlt

Browse Source
This commit is contained in:
Martin Stransky 2015-05-05 09:08:00 -04:00
parent fea72e6ec2
commit 4338099101
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widget/gtk/nsLookAndFeel.cpp
View File

@ -101,6 +101,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
case eColorID_window:
case eColorID_windowframe:
case eColorID__moz_dialog:
case eColorID__moz_combobox:
aColor = sMozWindowBackground;
break;
case eColorID_WindowForeground:
@ -404,9 +405,11 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
case eColorID__moz_comboboxtext:
aColor = sComboBoxText;
break;
#if (MOZ_WIDGET_GTK == 2)
case eColorID__moz_combobox:
aColor = sComboBoxBackground;
break;
#endif
case eColorID__moz_menubartext:
aColor = sMenuBarText;
break;
@ -1148,15 +1151,11 @@ nsLookAndFeel::Init()
gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
sButtonHoverText = GDK_RGBA_TO_NS_RGBA(color);
// Combobox label and background colors
// Combobox text color
style = gtk_widget_get_style_context(comboboxLabel);
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
sComboBoxText = GDK_RGBA_TO_NS_RGBA(color);
style = gtk_widget_get_style_context(combobox);
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
sComboBoxBackground = GDK_RGBA_TO_NS_RGBA(color);
// Menubar text and hover text colors
style = gtk_widget_get_style_context(menuBar);
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);