diff options
| -rw-r--r-- | applets/clock/clock.c | 2 | ||||
| -rw-r--r-- | libmate-panel-applet/mate-panel-applet.c | 26 |
2 files changed, 16 insertions, 12 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 8ba3406a..110e39ee 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -1362,7 +1362,7 @@ create_main_clock_button (void) gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); #if GTK_CHECK_VERSION (3, 20, 0) - force_no_button_padding (button); + force_no_button_padding (button); #else force_no_focus_padding (button); #endif diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index 74b3f4cd..3c71851c 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -1584,15 +1584,18 @@ mate_panel_applet_change_background(MatePanelApplet *applet, #else window = gtk_widget_get_window GTK_WIDGET((applet)); #endif - gtk_widget_set_app_paintable(GTK_WIDGET(applet),TRUE); - if (applet->priv->out_of_process) - _mate_panel_applet_apply_css(GTK_WIDGET(applet->priv->plug),type); - switch (type) { + + gtk_widget_set_app_paintable(GTK_WIDGET(applet),TRUE); + + if (applet->priv->out_of_process) + _mate_panel_applet_apply_css(GTK_WIDGET(applet->priv->plug),type); + + switch (type) { case PANEL_NO_BACKGROUND: if (applet->priv->out_of_process){ pattern = cairo_pattern_create_rgba (0,0,0,0); /* Using NULL here breaks transparent */ gdk_window_set_background_pattern(window,pattern); /* backgrounds set by GTK theme */ - } + } break; case PANEL_COLOR_BACKGROUND: if (applet->priv->out_of_process){ @@ -1602,7 +1605,7 @@ mate_panel_applet_change_background(MatePanelApplet *applet, #else gtk_widget_queue_draw (GTK_WIDGET(applet)); #endif - } + } break; case PANEL_PIXMAP_BACKGROUND: if (applet->priv->out_of_process){ @@ -1612,22 +1615,23 @@ mate_panel_applet_change_background(MatePanelApplet *applet, #else gtk_widget_queue_draw (GTK_WIDGET(applet)); #endif - } + } break; default: g_assert_not_reached (); break; - } - if (applet->priv->out_of_process){ + } + + if (applet->priv->out_of_process){ context = gtk_widget_get_style_context (GTK_WIDGET(applet->priv->plug)); if (applet->priv->orient == MATE_PANEL_APPLET_ORIENT_UP || applet->priv->orient == MATE_PANEL_APPLET_ORIENT_DOWN){ gtk_style_context_add_class(context,"horizontal"); - } + } else { gtk_style_context_add_class(context,"vertical"); - } } + } } static void |