From 97996ff00c727e648b0f8525608d3c6aba295a9c Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Sun, 15 Feb 2009 09:25:56 +0100 Subject: [PATCH] Only add up native subwindow offsets for gdk_window_quartz_get_origin --- gdk/quartz/gdkwindow-quartz.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index f112497e4f..2bb4bdb1c3 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -1678,8 +1678,11 @@ gdk_window_quartz_get_origin (GdkWindow *window, if (window == _gdk_root) { - *x = 0; - *y = 0; + if (x) + *x = 0; + if (y) + *y = 0; + return 1; } @@ -1695,8 +1698,11 @@ gdk_window_quartz_get_origin (GdkWindow *window, while (private != GDK_WINDOW_OBJECT (toplevel)) { - tmp_x += private->x; - tmp_y += private->y; + if (_gdk_window_has_impl ((GdkWindow *)private)) + { + tmp_x += private->x; + tmp_y += private->y; + } private = private->parent; }