[gnome-applets/wip-geiger-warnings: 4/4] window-picker: replace deprecated gtk_menu_popup



commit b2e813a39b520df48be2e407b059a66ff638bd69
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sat Apr 4 12:56:29 2020 +0200

    window-picker: replace deprecated gtk_menu_popup

 gnome-applets/window-picker/task-item.c | 48 ++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 4 deletions(-)
---
diff --git a/gnome-applets/window-picker/task-item.c b/gnome-applets/window-picker/task-item.c
index 45fb31af6..95af2a667 100644
--- a/gnome-applets/window-picker/task-item.c
+++ b/gnome-applets/window-picker/task-item.c
@@ -455,6 +455,46 @@ static void on_size_allocate (
     update_hints (item);
 }
 
+static void
+popup_menu_at_item (TaskItem *item,
+                    GtkMenu  *menu,
+                    GdkEvent *event)
+{
+    GdkGravity widget_anchor;
+    GdkGravity menu_anchor;
+
+    switch (gp_applet_get_position (GP_APPLET (item->windowPickerApplet)))
+    {
+        case GTK_POS_TOP:
+            widget_anchor = GDK_GRAVITY_SOUTH_WEST;
+            menu_anchor = GDK_GRAVITY_NORTH_WEST;
+            break;
+
+        case GTK_POS_LEFT:
+            widget_anchor = GDK_GRAVITY_NORTH_EAST;
+            menu_anchor = GDK_GRAVITY_NORTH_WEST;
+            break;
+
+        case GTK_POS_RIGHT:
+            widget_anchor = GDK_GRAVITY_NORTH_WEST;
+            menu_anchor = GDK_GRAVITY_NORTH_EAST;
+            break;
+
+        case GTK_POS_BOTTOM:
+            widget_anchor = GDK_GRAVITY_NORTH_WEST;
+            menu_anchor = GDK_GRAVITY_SOUTH_WEST;
+            break;
+
+        default:
+            g_assert_not_reached ();
+            break;
+    }
+
+    gtk_menu_popup_at_widget (menu, GTK_WIDGET (item),
+                              widget_anchor, menu_anchor,
+                              event);
+}
+
 static gboolean on_button_pressed (
     GtkWidget      *button,
     GdkEventButton *event,
@@ -464,12 +504,12 @@ static gboolean on_button_pressed (
     g_return_val_if_fail (TASK_IS_ITEM (item), FALSE);
     window = item->window;
     g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
+
     if (event->button == 3) {
         GtkWidget *menu = wnck_action_menu_new (window);
-        gtk_menu_popup (
-            GTK_MENU (menu), NULL, NULL, NULL, NULL,
-            event->button, event->time
-        );
+
+        popup_menu_at_item (item, GTK_MENU (menu), (GdkEvent *) event);
+
         return TRUE;
     }
     return FALSE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]