From bdb8bd13db56db682f029ce4f5224e148e9457e7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Nov 2003 22:49:02 +0000 Subject: [PATCH] Use the event window of the menuitem to determine the monitor. This fixes * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event window of the menuitem to determine the monitor. This fixes some --- ChangeLog | 5 ++++- ChangeLog.pre-2-10 | 5 ++++- ChangeLog.pre-2-4 | 5 ++++- ChangeLog.pre-2-6 | 5 ++++- ChangeLog.pre-2-8 | 5 ++++- gtk/gtkmenuitem.c | 2 +- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bc003ed56..ed05040843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ Wed Nov 12 21:40:10 2003 Matthias Clasen - Changes to improve menu positioning on Xinerama (#108328): + Changes to improve menu positioning on Xinerama (#108328, #126150): + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event + window of the menuitem to determine the monitor. This fixes some + * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field to store the monitor on which the menu is to be positioned. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7bc003ed56..ed05040843 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,10 @@ Wed Nov 12 21:40:10 2003 Matthias Clasen - Changes to improve menu positioning on Xinerama (#108328): + Changes to improve menu positioning on Xinerama (#108328, #126150): + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event + window of the menuitem to determine the monitor. This fixes some + * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field to store the monitor on which the menu is to be positioned. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7bc003ed56..ed05040843 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,7 +1,10 @@ Wed Nov 12 21:40:10 2003 Matthias Clasen - Changes to improve menu positioning on Xinerama (#108328): + Changes to improve menu positioning on Xinerama (#108328, #126150): + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event + window of the menuitem to determine the monitor. This fixes some + * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field to store the monitor on which the menu is to be positioned. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7bc003ed56..ed05040843 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,10 @@ Wed Nov 12 21:40:10 2003 Matthias Clasen - Changes to improve menu positioning on Xinerama (#108328): + Changes to improve menu positioning on Xinerama (#108328, #126150): + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event + window of the menuitem to determine the monitor. This fixes some + * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field to store the monitor on which the menu is to be positioned. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7bc003ed56..ed05040843 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,10 @@ Wed Nov 12 21:40:10 2003 Matthias Clasen - Changes to improve menu positioning on Xinerama (#108328): + Changes to improve menu positioning on Xinerama (#108328, #126150): + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event + window of the menuitem to determine the monitor. This fixes some + * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field to store the monitor on which the menu is to be positioned. diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 312c511070..3cb2b948f5 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1024,7 +1024,7 @@ gtk_menu_item_position_menu (GtkMenu *menu, theight = GTK_WIDGET (menu)->requisition.height; screen = gtk_widget_get_screen (widget); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); + monitor_num = gdk_screen_get_monitor_at_window (screen, menu_item->event_window); if (monitor_num < 0) monitor_num = 0; gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);