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

make the linter happier

Browse source
This commit is contained in:
Charles Kerr 2018-02-09 19:34:37 -06:00
parent 4b766d26df
commit 3710e0e38b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ namespace atom {
namespace { namespace {
#if defined(USE_X11) #if defined(USE_X11)
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3, 0, 0)
SkColor GdkRgbaToSkColor(const GdkRGBA& rgba) { SkColor GdkRgbaToSkColor(const GdkRGBA& rgba) {
return SkColorSetARGB(rgba.alpha*255, rgba.red*255, return SkColorSetARGB(rgba.alpha*255, rgba.red*255,
@ -50,12 +50,12 @@ SkColor GetStyleContextBgColor(GtkStyleContext* style_context,
void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight, void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
SkColor* hover, SkColor* background) { SkColor* hover, SkColor* background) {
GtkWidget* menu_bar = gtk_menu_bar_new(); GtkWidget* menu_bar = gtk_menu_bar_new();
GtkStyleContext* style_context = gtk_widget_get_style_context(menu_bar); GtkStyleContext* sc = gtk_widget_get_style_context(menu_bar);
*enabled = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_NORMAL); *enabled = GetStyleContextFgColor(sc, GTK_STATE_FLAG_NORMAL);
*disabled = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_INSENSITIVE); *disabled = GetStyleContextFgColor(sc, GTK_STATE_FLAG_INSENSITIVE);
*highlight = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_SELECTED); *highlight = GetStyleContextFgColor(sc, GTK_STATE_FLAG_SELECTED);
*hover = GetStyleContextFgColor(style_context, GTK_STATE_FLAG_PRELIGHT); *hover = GetStyleContextFgColor(sc, GTK_STATE_FLAG_PRELIGHT);
*background = GetStyleContextBgColor(style_context, GTK_STATE_FLAG_NORMAL); *background = GetStyleContextBgColor(sc, GTK_STATE_FLAG_NORMAL);
g_object_unref(G_OBJECT(menu_bar)); g_object_unref(G_OBJECT(menu_bar));
} }