summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2017-10-16 00:08:41 -0400
committerraveit65 <[email protected]>2017-11-07 21:39:17 +0100
commit5872276595223946c196bf0387aad20a27452ef9 (patch)
tree0b6ce41912015f539fa2194968c3ed1aa625b915
parentaf2fe7cf8f5678737060f96616ebc8a5ccf34f1e (diff)
downloadmate-panel-5872276595223946c196bf0387aad20a27452ef9.tar.bz2
mate-panel-5872276595223946c196bf0387aad20a27452ef9.tar.xz
Apply position fix on popup to GTK 3.20 and earlier
-rw-r--r--applets/notification_area/status-notifier/sn-dbus-menu.c6
-rw-r--r--applets/notification_area/status-notifier/sn-item.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/applets/notification_area/status-notifier/sn-dbus-menu.c b/applets/notification_area/status-notifier/sn-dbus-menu.c
index a9075bd6..855c2569 100644
--- a/applets/notification_area/status-notifier/sn-dbus-menu.c
+++ b/applets/notification_area/status-notifier/sn-dbus-menu.c
@@ -111,7 +111,6 @@ layout_update_item (SnDBusMenu *menu,
{
sn_dbus_menu_item_update_props (item, props);
}
-
return item->submenu;
}
@@ -179,8 +178,11 @@ get_layout_cb (GObject *source_object,
g_hash_table_remove_all (menu->items);
layout_parse (menu, layout, GTK_MENU (menu));
- /*Reposition to accomodate size change if necessary*/
+#if GTK_CHECK_VERSION (3, 22, 0)
+ /* Reposition menu to accomodate any size changes */
+ /* Menu size never changes with GTK 3.20 or earlier */
gtk_menu_reposition(GTK_MENU(menu));
+#endif
g_variant_unref (layout);
}
diff --git a/applets/notification_area/status-notifier/sn-item.c b/applets/notification_area/status-notifier/sn-item.c
index 5a523d55..a6875316 100644
--- a/applets/notification_area/status-notifier/sn-item.c
+++ b/applets/notification_area/status-notifier/sn-item.c
@@ -266,6 +266,8 @@ sn_item_button_press_event (GtkWidget *widget,
gtk_menu_popup (priv->menu, NULL, NULL,
sn_item_popup_menu_position_func, widget,
event->button, event->time);
+ /*Fix positioning if size changed since last shown*/
+ gtk_menu_reposition(priv->menu);
#endif
}
else
@@ -318,6 +320,8 @@ sn_item_popup_menu (GtkWidget *widget)
gtk_menu_popup (priv->menu, NULL, NULL,
sn_item_popup_menu_position_func, widget,
button, active_time);
+ /*Fix positioning if size changed since last shown*/
+ gtk_menu_reposition(priv->menu);
#endif
}
else