[gtk+/wip/attachment-rectangle: 8/8] menu: set attachment rectangle in gtk_menu_position

[William Hua <williamhua src gnome org>]

commit cfb9de0b04ba6ea9890ffce84e36e68ac7a32abc
Author: William Hua <william hua canonical com>
Date:   Thu Jul 30 16:43:15 2015 -0400

    menu: set attachment rectangle in gtk_menu_position

 gtk/gtkmenu.c        |   67 +++++++++++++++++++++++++++++--------------------
 gtk/gtkmenuprivate.h |    4 +++
 2 files changed, 44 insertions(+), 27 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 10caae5..4e368d1 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1540,11 +1540,6 @@ gtk_menu_popup_against (GtkMenu              *menu,
   GtkWidget *parent_toplevel;
   GdkDevice *keyboard, *pointer, *source_device = NULL;
   GdkDisplay *display;
-  GdkWindow *menu_window;
-  GdkWindow *parent_window;
-  GdkRectangle allocation;
-  gint x;
-  gint y;
 
   g_return_if_fail (GTK_IS_MENU (menu));
   g_return_if_fail (device == NULL || GDK_IS_DEVICE (device));
@@ -1718,6 +1713,16 @@ gtk_menu_popup_against (GtkMenu              *menu,
   priv->position_func_data_destroy = destroy;
   menu_shell->priv->activate_time = activate_time;
 
+  if (rect)
+    {
+      priv->has_attach_rect = TRUE;
+      priv->attach_rect = *rect;
+    }
+  else
+    priv->has_attach_rect = FALSE;
+
+  priv->attach_options = options;
+
   /* We need to show the menu here rather in the init function
    * because code expects to be able to tell if the menu is onscreen
    * by looking at gtk_widget_get_visible (menu)
@@ -1737,28 +1742,6 @@ gtk_menu_popup_against (GtkMenu              *menu,
       source_device && gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN)
     gtk_menu_shell_select_first (menu_shell, TRUE);
 
-  menu_window = gtk_widget_get_window (priv->toplevel);
-
-  if (menu_window)
-    {
-      if (rect)
-        gdk_window_set_attachment_rectangle (menu_window, rect, options);
-      else if ((options & GDK_ATTACHMENT_ATTACH_MASK) && GTK_IS_WIDGET (parent_menu_item))
-        {
-          parent_window = gtk_widget_get_window (parent_menu_item);
-
-          if (parent_window)
-            {
-              gdk_window_get_root_origin (parent_window, &x, &y);
-              gtk_widget_get_allocation (parent_menu_item, &allocation);
-              gdk_window_get_root_coords (parent_window, allocation.x, allocation.y, &allocation.x, 
&allocation.y);
-              allocation.x -= x;
-              allocation.y -= y;
-              gdk_window_set_attachment_rectangle (menu_window, &allocation, options);
-            }
-        }
-    }
-
   /* Once everything is set up correctly, map the toplevel */
   gtk_widget_show (priv->toplevel);
 
@@ -4546,6 +4529,36 @@ gtk_menu_position (GtkMenu  *menu,
   GdkRectangle monitor;
   GdkDevice *pointer;
   GtkBorder border;
+  GdkWindow *menu_window;
+  GdkWindow *parent_window;
+  GdkRectangle allocation;
+
+  menu_window = gtk_widget_get_window (priv->toplevel);
+
+  if (menu_window)
+    {
+      if (priv->has_attach_rect)
+        {
+          gdk_window_set_attachment_rectangle (menu_window, &priv->attach_rect, priv->attach_options);
+          return;
+        }
+      else if ((priv->attach_options & GDK_ATTACHMENT_ATTACH_MASK) && GTK_IS_WIDGET (priv->parent_menu_item))
+        {
+          parent_window = gtk_widget_get_window (priv->parent_menu_item);
+
+          if (parent_window)
+            {
+              gdk_window_get_root_origin (parent_window, &x, &y);
+              gdk_window_get_root_origin (gdk_window_get_parent (menu_window), &x, &y);
+              gtk_widget_get_allocation (priv->parent_menu_item, &allocation);
+              gdk_window_get_root_coords (parent_window, allocation.x, allocation.y, &allocation.x, 
&allocation.y);
+              allocation.x -= x;
+              allocation.y -= y;
+              gdk_window_set_attachment_rectangle (menu_window, &allocation, priv->attach_options);
+              return;
+            }
+        }
+    }
 
   widget = GTK_WIDGET (menu);
 
diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h
index f1a40d8..40e7f9f 100644
--- a/gtk/gtkmenuprivate.h
+++ b/gtk/gtkmenuprivate.h
@@ -51,6 +51,10 @@ struct _GtkMenuPrivate
   gint                position_x;
   gint                position_y;
 
+  gboolean has_attach_rect;
+  GdkRectangle attach_rect;
+  GdkAttachmentOptions attach_options;
+
   guint toggle_size;
   guint accel_size;