From 573df39c1708f35aa90a0db71877242b0ad1ecd4 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 6 Jun 2016 14:06:00 -0500 Subject: [PATCH] Allow pixmap argb state to override window state for wayland clients Wayland argb state depends entirely on the attached buffer, so we should use that for determining object argb state on wayland. ref 6d397e313b9c402167cc3206b19a8ca60a2525ea ref 60da58d8ad15968a8297aecd3df071d21a61c1fd --- src/bin/e_comp_object.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index f9cef6937..1bead67cf 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -351,10 +351,12 @@ _e_comp_object_updates_init(E_Comp_Object *cw) static void _e_comp_object_alpha_set(E_Comp_Object *cw) { - Eina_Bool alpha = cw->ec->argb; + Eina_Bool alpha; if (!e_pixmap_is_x(cw->ec->pixmap)) - alpha |= e_pixmap_image_is_argb(cw->ec->pixmap); + alpha = e_pixmap_image_is_argb(cw->ec->pixmap); + else + alpha = cw->ec->argb; if (cw->blanked || cw->ns || cw->ec->shaped) alpha = EINA_TRUE;