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

[Sebastian Geiger <segeiger src gnome org>]

commit 7d41291786913f1f0bd47cf99c34bd6b719dc98b
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 ++++++++++++++++--
 gnome-applets/window-picker/wp-applet.c     |  2 +-
 gnome-applets/window-picker/wp-task-title.c | 78 +++++++++++++++++++++++------
 gnome-applets/window-picker/wp-task-title.h |  5 +-
 4 files changed, 112 insertions(+), 21 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;
diff --git a/gnome-applets/window-picker/wp-applet.c b/gnome-applets/window-picker/wp-applet.c
index ce4d7621a..cba992f14 100644
--- a/gnome-applets/window-picker/wp-applet.c
+++ b/gnome-applets/window-picker/wp-applet.c
@@ -145,7 +145,7 @@ wp_applet_setup_title (WpApplet *applet)
 
   panel_applet = GP_APPLET (applet);
 
-  applet->title = wp_task_title_new (TITLE_BUTTON_SPACE);
+  applet->title = wp_task_title_new (TITLE_BUTTON_SPACE, applet);
 
   g_object_bind_property (applet->container, "orientation",
                           applet->title, "orientation",
diff --git a/gnome-applets/window-picker/wp-task-title.c b/gnome-applets/window-picker/wp-task-title.c
index 498fc0070..ee7d66f5d 100644
--- a/gnome-applets/window-picker/wp-task-title.c
+++ b/gnome-applets/window-picker/wp-task-title.c
@@ -35,18 +35,20 @@
 
 struct _WpTaskTitle
 {
-  GtkBox             parent;
+  GtkBox          parent;
 
-  GtkWidget         *label;
-  GtkWidget         *button;
-  GtkWidget         *image;
+  WpApplet       *applet;
 
-  gboolean           show_application_title;
-  gboolean           show_home_title;
-  GtkOrientation     orientation;
+  GtkWidget      *label;
+  GtkWidget      *button;
+  GtkWidget      *image;
 
-  WnckWindow        *active_window;
-  GDBusProxy        *session_proxy;
+  gboolean        show_application_title;
+  gboolean        show_home_title;
+  GtkOrientation  orientation;
+
+  WnckWindow     *active_window;
+  GDBusProxy     *session_proxy;
 };
 
 enum
@@ -468,6 +470,46 @@ wp_task_title_class_init (WpTaskTitleClass *title_class)
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
+static void
+popup_menu_at_item (WpTaskTitle *title,
+                    GtkMenu     *menu,
+                    GdkEvent    *event)
+{
+    GdkGravity widget_anchor;
+    GdkGravity menu_anchor;
+
+    switch (gp_applet_get_position (GP_APPLET (title->applet)))
+    {
+        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 (title),
+                              widget_anchor, menu_anchor,
+                              event);
+}
+
 static gboolean
 label_button_press_event_cb (GtkWidget      *widget,
                              GdkEventButton *event,
@@ -489,8 +531,7 @@ label_button_press_event_cb (GtkWidget      *widget,
 
           menu = wnck_action_menu_new (title->active_window);
 
-          gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                          event->button, event->time);
+          popup_menu_at_item (title, GTK_MENU (menu), (GdkEvent *) event);
 
           return TRUE;
         }
@@ -589,9 +630,16 @@ wp_task_title_init (WpTaskTitle *title)
 }
 
 GtkWidget *
-wp_task_title_new (gint spacing)
+wp_task_title_new (gint      spacing,
+                   WpApplet *applet)
 {
-  return g_object_new (WP_TYPE_TASK_TITLE,
-                       "spacing", spacing,
-                       NULL);
+  WpTaskTitle *title;
+
+  title = g_object_new (WP_TYPE_TASK_TITLE,
+                        "spacing", spacing,
+                         NULL);
+
+  title->applet = applet;
+
+  return GTK_WIDGET (title);
 }
diff --git a/gnome-applets/window-picker/wp-task-title.h b/gnome-applets/window-picker/wp-task-title.h
index 4450e310b..d97b54145 100644
--- a/gnome-applets/window-picker/wp-task-title.h
+++ b/gnome-applets/window-picker/wp-task-title.h
@@ -25,12 +25,15 @@
 
 #include <gtk/gtk.h>
 
+#include "wp-applet.h"
+
 G_BEGIN_DECLS
 
 #define WP_TYPE_TASK_TITLE wp_task_title_get_type ()
 G_DECLARE_FINAL_TYPE (WpTaskTitle, wp_task_title, WP, TASK_TITLE, GtkBox)
 
-GtkWidget *wp_task_title_new (gint spacing);
+GtkWidget *wp_task_title_new (gint      spacing,
+                              WpApplet *applet);
 
 G_END_DECLS