From 3710e0e38be95670de3ca41cec9618103d424a29 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 9 Feb 2018 19:34:37 -0600 Subject: [PATCH] make the linter happier --- atom/browser/ui/views/menu_bar.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc index 3e71cfad9d1f..82392d43ac95 100644 --- a/atom/browser/ui/views/menu_bar.cc +++ b/atom/browser/ui/views/menu_bar.cc @@ -25,7 +25,7 @@ namespace atom { namespace { #if defined(USE_X11) -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3, 0, 0) SkColor GdkRgbaToSkColor(const GdkRGBA& rgba) { 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, 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); + GtkStyleContext* sc = gtk_widget_get_style_context(menu_bar); + *enabled = GetStyleContextFgColor(sc, GTK_STATE_FLAG_NORMAL); + *disabled = GetStyleContextFgColor(sc, GTK_STATE_FLAG_INSENSITIVE); + *highlight = GetStyleContextFgColor(sc, GTK_STATE_FLAG_SELECTED); + *hover = GetStyleContextFgColor(sc, GTK_STATE_FLAG_PRELIGHT); + *background = GetStyleContextBgColor(sc, GTK_STATE_FLAG_NORMAL); g_object_unref(G_OBJECT(menu_bar)); }