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

fix gtk3 deprecation warnings setting menubar colors

Browse source
This commit is contained in:
Charles Kerr 2018-02-09 19:04:59 -06:00
parent b107d3f440
commit 3f5ce6d74f
1 changed files with 52 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,27 +24,63 @@ namespace atom {
namespace { namespace {
#if defined(USE_X11)
#if GTK_CHECK_VERSION(3,0,0)
SkColor GdkRgbaToSkColor(const GdkRGBA& rgba) {
return SkColorSetARGB(rgba.alpha*255, rgba.red*255,
rgba.green*255, rgba.blue*255);
}
SkColor GetStyleContextFgColor(GtkStyleContext* style_context,
GtkStateFlags state) {
GdkRGBA rgba;
gtk_style_context_get_color(style_context, state, &rgba);
return GdkRgbaToSkColor(rgba);
}
SkColor GetStyleContextBgColor(GtkStyleContext* style_context,
GtkStateFlags state) {
GdkRGBA rgba;
gtk_style_context_get_background_color(style_context, state, &rgba);
return GdkRgbaToSkColor(rgba);
}
// GTK+ 3 impl
void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
SkColor* hover, SkColor* background) {
GtkWidget* menu_bar = gtk_menu_bar_new();
GtkStyleContext* style_context = gtk_widget_get_style_context(menu_bar);
*enabled = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_NORMAL);
*disabled = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_INSENSITIVE);
*highlight = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_SELECTED);
*hover = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_PRELIGHT);
*background = GetStyleContextBgColor(style_context, GTK_STATE_FLAG_NORMAL);
g_object_unref(G_OBJECT(menu_bar));
}
#else // GTK_CHECK_VERSION(3,0,0)
// GTK+ 2 impl
void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
SkColor* hover, SkColor* background) {
GtkWidget* menu_bar = gtk_menu_bar_new();
GtkStyle* style = gtk_rc_get_style(menu_bar);
*enabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
*disabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
*highlight = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
*hover = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
*background = libgtkui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
g_object_unref(G_OBJECT(menu_bar));
}
#endif // GTK_CHECK_VERSION(3,0,0)
#endif // USE_X11
const char kViewClassName[] = "ElectronMenuBar"; const char kViewClassName[] = "ElectronMenuBar";
// Default color of the menu bar. // Default color of the menu bar.
const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233); const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
#if defined(USE_X11)
void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
SkColor* hover, SkColor* background) {
GtkWidget* menu_bar = gtk_menu_bar_new();
GtkStyle* style = gtk_rc_get_style(menu_bar);
*enabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
*disabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
*highlight = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
*hover = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
*background = libgtkui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
gtk_widget_destroy(menu_bar);
}
#endif
} // namespace } // namespace
MenuBar::MenuBar(NativeWindow* window) MenuBar::MenuBar(NativeWindow* window)