From e9a58190af6e9a326f1da04af471f4315efa895f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 10 Apr 2016 23:42:57 -0400 Subject: combobox: Stop using screen width/height Popups should always be placed relative to a monitor. --- gtk/gtkcombobox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gtk/gtkcombobox.c') diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index fe21a1fa9d..481c1808c6 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2007,10 +2007,12 @@ gtk_combo_box_menu_position_over (GtkMenu *menu, GtkAllocation content_allocation; GtkAllocation child_allocation; GList *children; - gint screen_width; gint menu_xpos; gint menu_ypos; gint menu_width; + GdkDisplay *display; + GdkMonitor *monitor; + GdkRectangle workarea; active = gtk_menu_get_active (GTK_MENU (priv->popup_widget)); @@ -2056,12 +2058,14 @@ gtk_combo_box_menu_position_over (GtkMenu *menu, &menu_xpos, &menu_ypos); /* Clamp the position on screen */ - screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget)); - - if (menu_xpos < 0) - menu_xpos = 0; - else if ((menu_xpos + menu_width) > screen_width) - menu_xpos -= ((menu_xpos + menu_width) - screen_width); + display = gtk_widget_get_display (widget); + monitor = gdk_display_get_monitor_at_window (display, gtk_widget_get_window (widget)); + gdk_monitor_get_workarea (monitor, &workarea); + + if (menu_xpos < workarea.x) + menu_xpos = workarea.x; + else if ((menu_xpos + menu_width) > workarea.x + workarea.width) + menu_xpos -= (menu_xpos + menu_width) - (workarea.x + workarea.width); *x = menu_xpos; *y = menu_ypos; -- cgit v1.2.1