mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

linux: Use "fg" of GtkStyle as text color, fixes #555.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-18 10:21:38 +08:00
parent 48c227c263
commit e25417ab31
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/ui/views/menu_bar.cc
View file

@ -46,10 +46,10 @@ void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
fake_menu_bar.Own(gtk_menu_bar_new()); fake_menu_bar.Own(gtk_menu_bar_new());
GtkStyle* style = gtk_rc_get_style(fake_menu_bar.get()); GtkStyle* style = gtk_rc_get_style(fake_menu_bar.get());
*enabled = libgtk2ui::GdkColorToSkColor(style->text[GTK_STATE_NORMAL]); *enabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
*disabled = libgtk2ui::GdkColorToSkColor(style->text[GTK_STATE_INSENSITIVE]); *disabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
*highlight = libgtk2ui::GdkColorToSkColor(style->text[GTK_STATE_SELECTED]); *highlight = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
*hover = libgtk2ui::GdkColorToSkColor(style->text[GTK_STATE_PRELIGHT]); *hover = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
*background = libgtk2ui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]); *background = libgtk2ui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
} }
#endif #endif