summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2007-05-30 15:40:01 +0000
committerTor Lillqvist <tml@src.gnome.org>2007-05-30 15:40:01 +0000
commitb2c49c57bceed0f6cfcd198b4d11b0d397945112 (patch)
tree6b5e1f3a72ec72406633b0cd73cdfeb5450c35ab
parent199d440c8ed7a5ca2ac8e080a73a1a68b245c152 (diff)
downloadgdk-pixbuf-b2c49c57bceed0f6cfcd198b4d11b0d397945112.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=/branches/gtk-2-10/; revision=17987
-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 0b9794298..a93ed5366 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>
Merged from trunk:
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 1c2fd52c0..139fe07f5 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -619,6 +619,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;