summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-08-25 18:12:07 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-08-25 18:12:07 +0000
commit70bce53b8ef1bca6673f44631b55e5aafb9e8dc7 (patch)
tree76892eb7fa34e64264b9f7b3cc84afd41857ddcf
parentebc47dba8d50404be13548c8e5227e2b88ff7e50 (diff)
downloadgdk-pixbuf-70bce53b8ef1bca6673f44631b55e5aafb9e8dc7.tar.gz
Take widget y offset into account when positioning the popup. (#314470,
2005-08-25 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget y offset into account when positioning the popup. (#314470, Christian Persch)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--gtk/gtkmenutoolbutton.c1
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d7d980a4b..82f7a05ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-25 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget
+ y offset into account when positioning the popup. (#314470,
+ Christian Persch)
+
2005-08-25 Owen Taylor <otaylor@redhat.com>
* gdk/gdkscreen.c (gdk_screen_get_type): Use gdk_screen_init
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d7d980a4b..82f7a05ab 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-25 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget
+ y offset into account when positioning the popup. (#314470,
+ Christian Persch)
+
2005-08-25 Owen Taylor <otaylor@redhat.com>
* gdk/gdkscreen.c (gdk_screen_get_type): Use gdk_screen_init
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 12e1aec08..856a4f15d 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -307,6 +307,7 @@ menu_position_func (GtkMenu *menu,
{
gdk_window_get_origin (widget->window, x, y);
*x += widget->allocation.x;
+ *y += widget->allocation.y;
if (direction == GTK_TEXT_DIR_LTR)
*x += MAX (widget->allocation.width - menu_req.width, 0);