This is an automated email from the git hooks/post-receive script. o l i v i e r p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfwm4.
commit ba3ed23733edb9b96bfab89a67d3cea5afc73e1b Author: Olivier Fourdan <[email protected]> Date: Wed May 1 12:47:35 2019 +0200 icons: Do not apply mask on bitmaps Bitmaps (1bpp depth) already represent their mask, do not try to apply a mask to it. Fixes the black icons with some legacy apps (xclock, xcalc, nedit, etc.) Signed-off-by: Olivier Fourdan <[email protected]> --- src/icons.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/icons.c b/src/icons.c index f55e011..e547022 100644 --- a/src/icons.c +++ b/src/icons.c @@ -376,7 +376,6 @@ get_pixbuf_from_pixmap (ScreenInfo *screen_info, Pixmap xpixmap, guint width, gu #endif retval = NULL; - if (depth == 1) { surface = cairo_xlib_surface_create_for_bitmap (screen_info->display_info->dpy, @@ -436,7 +435,7 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap src_pixmap, Pixmap src_mask icon = NULL; mask = NULL; - if (unscaled && src_mask) + if (depth > 1 && unscaled && src_mask) { get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_mask, &w, &h, &depth); mask = get_pixbuf_from_pixmap (screen_info, src_mask, w, h, depth); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
