summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-03-24 23:38:33 -0400
committerraveit65 <[email protected]>2016-03-25 11:01:42 +0100
commit40bb634d564dbf752fcc3420d3d92cef94eea592 (patch)
tree1b2f9d91c13c296877b4db684ddb6aa410d62339
parent448750ef63b8806323a4f4a9ed79e126cab206d6 (diff)
downloadmate-panel-40bb634d564dbf752fcc3420d3d92cef94eea592.tar.bz2
mate-panel-40bb634d564dbf752fcc3420d3d92cef94eea592.tar.xz
Gtk3.18/3.20-move background handling toplevel
panel-menu-bar.c
-rw-r--r--mate-panel/panel-menu-bar.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index 3f0c9b9f..c926e5a0 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -274,8 +274,11 @@ static void panel_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* alloc
return;
}
+#if GTK_CHECK_VERSION (3, 18, 0)
+ background = &PANEL_MENU_BAR(widget)->priv->panel->toplevel->background;
+#else
background = &PANEL_MENU_BAR(widget)->priv->panel->background;
-
+#endif
if (background->type == PANEL_BACK_NONE || (background->type == PANEL_BACK_COLOR && !background->has_alpha))
{
return;
@@ -483,7 +486,9 @@ void panel_menu_bar_popup_menu(PanelMenuBar* menubar, guint32 activate_time)
void panel_menu_bar_change_background(PanelMenuBar* menubar)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
+#if GTK_CHECK_VERSION (3, 18, 0)
+ panel_background_apply_css(&menubar->priv->panel->toplevel->background, GTK_WIDGET(menubar));
+#elif GTK_CHECK_VERSION (3, 0, 0)
panel_background_apply_css(&menubar->priv->panel->background, GTK_WIDGET(menubar));
#else
panel_background_change_background_on_widget(&menubar->priv->panel->background, GTK_WIDGET(menubar));