From dcf81c53dc8049b7866e0544b53d06dce5224aa2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 21 May 2007 02:58:16 +0000 Subject: [PATCH] Make it work better with multiple monitors. 2007-05-21 Tor Lillqvist * gtk/gtkscalebutton.c (gtk_scale_popup): Make it work better with multiple monitors. svn path=/trunk/; revision=17881 --- ChangeLog | 5 +++++ gtk/gtkscalebutton.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06a74aaad1..8ed3f27e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-21 Tor Lillqvist + + * gtk/gtkscalebutton.c (gtk_scale_popup): Make it work better with + multiple monitors. + 2007-05-20 Attilio Fiandrotti * gdk/directfb/gdkwindow-directfb.c: diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 307a253df1..1ac3db438e 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -694,8 +694,8 @@ gtk_scale_popup (GtkWidget *widget, d = GTK_WIDGET (priv->dock); monitor = gdk_screen_get_monitor_at_point (screen, - button_event->x, - button_event->y); + button_event->x_root, + button_event->y_root); gdk_screen_get_monitor_geometry (screen, monitor, &rect); y += button_event->y; @@ -706,7 +706,7 @@ gtk_scale_popup (GtkWidget *widget, if (x < rect.x) x = rect.x; - else if (x + d->allocation.width > rect.width - rect.x) + else if (x + d->allocation.width > rect.width + rect.x) x = rect.x + rect.width - d->allocation.width; }