From 83fa4f68684863c2b593acce2b445fe704e5f211 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 30 Nov 2012 10:26:18 +0000 Subject: [PATCH] small change - doesnt fix a bug really... but get if screen is composited before using argb in elm vs shaped. SVN revision: 79878 --- legacy/elementary/src/lib/elm_win.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index cb3e423702..5c2bd1bb62 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -2674,7 +2674,13 @@ _win_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list) sd->wl.win = ecore_evas_wayland_window_get(sd->ee); #endif - if ((_elm_config->bgpixmap) && (!_elm_config->compositing)) + if ((_elm_config->bgpixmap) +#ifdef HAVE_ELEMENTARY_X + && + (((sd->x.xwin) && (!ecore_x_screen_is_composited(0))) || + (!sd->x.xwin))) +#endif + ) TRAP(sd, avoid_damage_set, ECORE_EVAS_AVOID_DAMAGE_EXPOSE); // bg pixmap done by x - has other issues like can be redrawn by x before it // is filled/ready by app @@ -3259,7 +3265,7 @@ _alpha_set(Eo *obj, void *_pd, va_list *list) { if (enabled) { - if (!_elm_config->compositing) + if (!ecore_x_screen_is_composited(0)) elm_win_shaped_set(obj, enabled); else TRAP(sd, alpha_set, enabled);