AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Don't set ParentRealtive if the parent's visual is different

Browse Source 
Causes a BadMatch otherwise, see code comments.

https://bugzilla.gnome.org/show_bug.cgi?id=630864
This commit is contained in:
Benjamin Otte 2010-09-29 12:06:19 +02:00
parent 72d48cbc61
commit 82e6e32c77
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/x11/gdkwindow-x11.c
View File

@ -2639,8 +2639,17 @@ gdk_window_x11_set_background (GdkWindow *window,
if (pattern == NULL) if (pattern == NULL)
{ {
XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window), GdkWindow *parent;
GDK_WINDOW_XID (window), ParentRelative);
/* X throws BadMatch if the parent has a different visual when
* using ParentRelative */
parent = gdk_window_get_parent (window);
if (parent && gdk_window_get_visual (parent) == gdk_window_get_visual (window))
XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window), ParentRelative);
else
XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window), None);
return; return;
} }