Commit 5bfab2b9 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Short-circuit get_frame_extents for override-redirect windows

There's no reason to do our expensive round-trips for an override-redirect
window; just use local information. See bug 581145. Patch by Owen Taylor.
parent 7abd4d13
...@@ -2920,6 +2920,7 @@ gdk_window_get_frame_extents (GdkWindow *window, ...@@ -2920,6 +2920,7 @@ gdk_window_get_frame_extents (GdkWindow *window,
{ {
GdkDisplay *display; GdkDisplay *display;
GdkWindowObject *private; GdkWindowObject *private;
GdkWindowImplX11 *impl;
Window xwindow; Window xwindow;
Window xparent; Window xparent;
Window root; Window root;
...@@ -2955,7 +2956,8 @@ gdk_window_get_frame_extents (GdkWindow *window, ...@@ -2955,7 +2956,8 @@ gdk_window_get_frame_extents (GdkWindow *window,
rect->y = private->y; rect->y = private->y;
gdk_drawable_get_size ((GdkDrawable *)private, &rect->width, &rect->height); gdk_drawable_get_size ((GdkDrawable *)private, &rect->width, &rect->height);
if (GDK_WINDOW_DESTROYED (private)) impl = GDK_WINDOW_IMPL_X11 (private->impl);
if (GDK_WINDOW_DESTROYED (private) || impl->override_redirect)
return; return;
nvroots = 0; nvroots = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment