[EGIT] [core/enlightenment] enlightenment-0.20 01/27: Allow pixmap argb state to override window state for wayland clients

[Derek Foreman]

discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=5d818684aa190a1b255b899dc3b16d931bd007d0

commit 5d818684aa190a1b255b899dc3b16d931bd007d0
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Mon Jun 6 14:06:00 2016 -0500

    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 b496917..141517e 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -316,10 +316,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;
 

--