[EGIT] [core/efl] efl-1.17 03/03: evas: Also fix was_opaque for rect & image

[Jean-Philippe ANDRÉ]

simotek pushed a commit to branch efl-1.17.

http://git.enlightenment.org/core/efl.git/commit/?id=589c25735fb6f68aa95ba9937a90933ebe139312

commit 589c25735fb6f68aa95ba9937a90933ebe139312
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Mon Jul 18 13:53:33 2016 +0900

    evas: Also fix was_opaque for rect & image
    
    I believe the function is not used, so it doesn't really
    matter.
---
 src/lib/evas/canvas/evas_object_image.c     | 2 ++
 src/lib/evas/canvas/evas_object_rectangle.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_object_image.c 
b/src/lib/evas/canvas/evas_object_image.c
index f51b267..5f92a30 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -4187,6 +4187,8 @@ evas_object_image_was_opaque(Evas_Object *eo_obj 
EINA_UNUSED,
           return o->prev->opaque; /* FIXME: Should go poke at the object */
         if (o->prev->has_alpha)
           return o->prev->opaque;
+        if (o->has_filter)
+          return o->cur->opaque;
 
         EINA_COW_WRITE_BEGIN(evas_object_image_state_cow, o->prev, 
Evas_Object_Image_State, state_write)
           {
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c 
b/src/lib/evas/canvas/evas_object_rectangle.c
index b6a05f4..d45d491 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -376,7 +376,7 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj 
EINA_UNUSED,
        return 1;
    if (obj->prev->render_op != EVAS_RENDER_BLEND)
        return 0;
-   return 1;
+   return (obj->prev->cache.clip.a == 255) ? 1 : 0;
 }
 
 static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)

--