summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2007-05-30 15:44:28 +0000
committerTor Lillqvist <tml@src.gnome.org>2007-05-30 15:44:28 +0000
commitd022f4c32de973e64c3a0d3452db888b709bbfe5 (patch)
tree3872a77b0563be6950c2b96f6bd505d189a19928
parent8bcf5c23c3151b5ef8d62620fff878b6182ca74d (diff)
downloadgtk+-d022f4c32de973e64c3a0d3452db888b709bbfe5.tar.gz
Subtract the multi-monitor offset from x and y before setting up the
2007-05-30 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Subtract the multi-monitor offset from x and y before setting up the rectangle for ClipCursor(). Fixes #442326. svn path=/trunk/; revision=17988
-rw-r--r--ChangeLog6
-rw-r--r--gdk/win32/gdkevents-win32.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 88d2ec31ff..e5b9a66a83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-30 Tor Lillqvist <tml@novell.com>
+
+ * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Subtract the
+ multi-monitor offset from x and y before setting up the rectangle
+ for ClipCursor(). Fixes #442326.
+
2007-05-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_layout): Queue a resize
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 285b736ceb..5059a88993 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -565,6 +565,9 @@ gdk_pointer_grab (GdkWindow *window,
gdk_window_get_origin (confine_to, &x, &y);
gdk_drawable_get_size (confine_to, &width, &height);
+ x -= _gdk_offset_x;
+ y -= _gdk_offset_y;
+
rect.left = x;
rect.top = y;
rect.right = x + width;