summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hult <richard@imendio.com>2007-06-30 09:12:56 +0000
committerRichard Hult <rhult@src.gnome.org>2007-06-30 09:12:56 +0000
commitd793d416da88a1923bb14bdbf0eea7c7bad7ac5a (patch)
treecda524a48936700a41329d018186808132f719de
parent8fd51a225e13d9d6b1e1c83cdabf247523b09bd1 (diff)
downloadgdk-pixbuf-d793d416da88a1923bb14bdbf0eea7c7bad7ac5a.tar.gz
Make this work properly for the root window.
2007-06-30 Richard Hult <richard@imendio.com> * gdk/quartz/gdkwindow-quartz.c: (gdk_window_get_origin): Make this work properly for the root window. svn path=/trunk/; revision=18311
-rw-r--r--ChangeLog9
-rw-r--r--gdk/quartz/gdkwindow-quartz.c7
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ca0272f8..ccf524f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
2007-06-30 Richard Hult <richard@imendio.com>
+ * gdk/quartz/gdkwindow-quartz.c: (gdk_window_get_origin): Make
+ this work properly for the root window.
+
+2007-06-30 Richard Hult <richard@imendio.com>
+
* gdk/quartz/GdkQuartzView.c: Improve the tracking rect updating:
- No need to override setFrame.
- - Use our own size instead of the bounds from for the view as it's
- not always updated before the tracking rect.
+ - Use our own size instead of the bounds from the view as it's not
+ always updated before the tracking rect.
- Only reset the tracking rect if the new window is nil).
* gdk/quartz/GdkQuartzWindow.c: Update the bounds of the content
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index a4e62fa92..d2e1f6aff 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1208,6 +1208,13 @@ gdk_window_get_origin (GdkWindow *window,
return FALSE;
}
+
+ if (window == _gdk_root)
+ {
+ *x = 0;
+ *y = 0;
+ return TRUE;
+ }
private = GDK_WINDOW_OBJECT (window);