aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/evas/src/lib/canvas/evas_clip.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-09-01 22:45:30 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-09-01 22:45:30 +0000
commit6e3d6712193ee22495fe5539fd663ba1078f52c0 (patch)
tree50ff69d919e9eb17ce3c348936d3dc4eb96d19c7 /legacy/evas/src/lib/canvas/evas_clip.c
parentuse Eina_Bool instead of unsigned int (diff)
downloadefl-6e3d6712193ee22495fe5539fd663ba1078f52c0.tar.gz
and fix up some related map+clip+smart render issues along with fixing
map boundary bugs as in trying to fix it i added some bugs. SVN revision: 51826
Diffstat (limited to 'legacy/evas/src/lib/canvas/evas_clip.c')
-rw-r--r--legacy/evas/src/lib/canvas/evas_clip.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_clip.c b/legacy/evas/src/lib/canvas/evas_clip.c
index 6b0ae2bdf5..b983e6c079 100644
--- a/legacy/evas/src/lib/canvas/evas_clip.c
+++ b/legacy/evas/src/lib/canvas/evas_clip.c
@@ -111,14 +111,8 @@ void
evas_object_mapped_clip_across_mark(Evas_Object *obj)
{
#ifdef MAP_ACROSS
- Eina_Bool map = 0;
-
- if ((obj->cur.map) && (obj->cur.usemap)) map = 1;
-
- if (map)
- {
- evas_object_child_map_across_mark(obj, obj, 0);
- }
+ if ((obj->cur.map) && (obj->cur.usemap))
+ evas_object_child_map_across_mark(obj, obj, 0);
else
{
if (obj->smart.parent)
@@ -241,7 +235,8 @@ evas_object_clip_set(Evas_Object *obj, Evas_Object *clip)
evas_object_change(obj);
evas_object_clip_dirty(obj);
evas_object_recalc_clippees(obj);
- if (!obj->smart.smart)
+ if ((!obj->smart.smart) &&
+ (!((obj->cur.map) && (obj->cur.usemap))))
{
if (evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
@@ -343,7 +338,8 @@ evas_object_clip_unset(Evas_Object *obj)
evas_object_change(obj);
evas_object_clip_dirty(obj);
evas_object_recalc_clippees(obj);
- if (!obj->smart.smart)
+ if ((!obj->smart.smart) &&
+ (!((obj->cur.map) && (obj->cur.usemap))))
{
if (evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,