fix clip-out issue after making mapped objs opque fix was in.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@64413 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Conflicts:

	src/lib/canvas/evas_map.c

diff --git a/src/lib/canvas/evas_map.c b/src/lib/canvas/evas_map.c
index 2ecf9c1..87408ee 100644 (file)
--- a/src/lib/canvas/evas_map.c
+++ b/src/lib/canvas/evas_map.c
@@ -95,6 +95,10 @@ _evas_map_calc_map_geometry(Evas_Object *obj)
         if (p->y < y1) y1 = p->y;
         if (p->y > y2) y2 = p->y;
      }
+// this causes clip-out bugs now mapped objs canbe opaque!!!   
+//   // add 1 pixel of fuzz around the map region to ensure updates are correct
+//   x1 -= 1; y1 -= 1;
+//   x2 += 1; y2 += 1;
    if (obj->cur.map->normal_geometry.x != x1) ch = 1;
    if (obj->cur.map->normal_geometry.y != y1) ch = 1;
    if (obj->cur.map->normal_geometry.w != (x2 - x1)) ch = 1;

diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c
index f37d436..899565b 100755 (executable)
--- a/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c
@@ -3490,7 +3490,13 @@ evas_object_image_is_opaque(Evas_Object *obj)
                      (m->points[0].y == m->points[3].y) &&
                      (m->points[1].y == m->points[2].y))
                 )
-               return o->cur.opaque;
+               {
+                  if ((m->points[0].x == obj->cur.geometry.x) &&
+                      (m->points[0].y == obj->cur.geometry.y) &&
+                      (m->points[2].x == (obj->cur.geometry.x + obj->cur.geometry.w)) &&
+                      (m->points[2].y == (obj->cur.geometry.y + obj->cur.geometry.h)))
+                    return o->cur.opaque;
+               }
           }
         o->cur.opaque = 0;
         return o->cur.opaque;

diff --git a/src/lib/include/evas_inline.x b/src/lib/include/evas_inline.x
index 3137579..4886d0d 100644 (file)
--- a/src/lib/include/evas_inline.x
+++ b/src/lib/include/evas_inline.x
@@ -208,13 +208,14 @@ evas_object_clip_recalc(Evas_Object *obj)
    cb = obj->cur.color.b; ca = obj->cur.color.a;
    if (obj->cur.clipper)
      {
-// this causes problems... hmmm
+// this causes problems... hmmm ?????
         if (obj->cur.clipper->cur.cache.clip.dirty)
           evas_object_clip_recalc(obj->cur.clipper);
 
         // I don't know why this test was here in the first place. As I have
         // no issue showing up due to this, I keep it and move color out of it.
-        if (obj->cur.clipper->cur.map_parent == obj->cur.map_parent)
+// breaks cliping of mapped images!!!
+//        if (obj->cur.clipper->cur.map_parent == obj->cur.map_parent)
           {
              nx = obj->cur.clipper->cur.cache.clip.x;
              ny = obj->cur.clipper->cur.cache.clip.y;