[Xfce4-commits] [xfce/xfwm4] 03/07: Fix window pixmaps disappearing on themes reload

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 618582bf4999dbf0533f8fe14f26273d2acd200a
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Feb 6 22:01:14 2015 +0100

    Fix window pixmaps disappearing on themes reload
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/compositor.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 1a953d4..e6819a2 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -739,7 +739,7 @@ free_win_data (CWindow *cw, gboolean delete)
     display_info = screen_info->display_info;
 
 #if HAVE_NAME_WINDOW_PIXMAP
-    if (cw->saved_window_pixmap)
+    if (cw->name_window_pixmap || delete)
     {
         XFreePixmap (display_info->dpy, cw->saved_window_pixmap);
         cw->saved_window_pixmap = None;
@@ -3115,6 +3115,7 @@ compositorScaleWindowPixmap (CWindow *cw, guint *width, guint *height)
 
     render_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
     destPicture = XRenderCreatePicture (dpy, pixmap, render_format, 0, NULL);
+    XRenderSetPictureFilter (dpy, destPicture, FilterBilinear, 0, 0);
 
     XRenderFillRectangle (dpy, PictOpSrc, destPicture, &c, 0, 0, dest_w, dest_h);
     XRenderComposite (dpy, PictOpSrc, srcPicture, None, destPicture,
@@ -3759,7 +3760,7 @@ compositorRebuildScreen (ScreenInfo *screen_info)
     GList *list;
 
     g_return_if_fail (screen_info != NULL);
-    TRACE ("entering compositorRepairScreen");
+    TRACE ("entering compositorRebuildScreen");
 
     display_info = screen_info->display_info;
     if (!compositorIsUsable (display_info))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.