diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2016-06-06 14:06:00 -0500 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2016-06-06 14:06:00 -0500 |
| commit | 573df39c1708f35aa90a0db71877242b0ad1ecd4 (patch) | |
| tree | 0232b4ce3664f3bfa7d0314830ca2160431186df | |
| parent | e95098fedbfcb5d9fa44f4715f3b14c741ec4981 (diff) | |
| download | enlightenment-573df39c1708f35aa90a0db71877242b0ad1ecd4.tar.gz | |
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
| -rw-r--r-- | src/bin/e_comp_object.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index f9cef69379..1bead67cfe 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; |