fix another evas map clip issue! hooray! never ending list!

SVN revision: 65044
This commit is contained in:
Carsten Haitzler 2011-11-11 05:56:40 +00:00
parent b739c80dcd
commit edaeefa288
2 changed files with 31 additions and 9 deletions

View File

@ -3379,11 +3379,22 @@ evas_object_image_render_pre(Evas_Object *obj)
if (evas_object_is_visible(obj) && if (evas_object_is_visible(obj) &&
evas_object_is_opaque(obj)) evas_object_is_opaque(obj))
{ {
e->engine.func->output_redraws_rect_del(e->engine.data.output, Evas_Coord x, y, w, h;
obj->cur.cache.clip.x,
obj->cur.cache.clip.y, x = obj->cur.cache.clip.x;
obj->cur.cache.clip.w, y = obj->cur.cache.clip.y;
obj->cur.cache.clip.h); w = obj->cur.cache.clip.w;
h = obj->cur.cache.clip.h;
if (obj->cur.clipper)
{
RECTS_CLIP_TO_RECT(x, y, w, h,
obj->cur.clipper->cur.cache.clip.x,
obj->cur.clipper->cur.cache.clip.y,
obj->cur.clipper->cur.cache.clip.w,
obj->cur.clipper->cur.cache.clip.h);
}
e->engine.func->output_redraws_rect_del(e->engine.data.output,
x, y, w, h);
} }
done: done:
evas_object_render_pre_effect_updates(&e->clip_changes, obj, is_v, was_v); evas_object_render_pre_effect_updates(&e->clip_changes, obj, is_v, was_v);

View File

@ -134,11 +134,22 @@ _evas_render_prev_cur_clip_cache_add(Evas *e, Evas_Object *obj)
static void static void
_evas_render_cur_clip_cache_del(Evas *e, Evas_Object *obj) _evas_render_cur_clip_cache_del(Evas *e, Evas_Object *obj)
{ {
Evas_Coord x, y, w, h;
x = obj->cur.cache.clip.x;
y = obj->cur.cache.clip.y;
w = obj->cur.cache.clip.w;
h = obj->cur.cache.clip.h;
if (obj->cur.clipper)
{
RECTS_CLIP_TO_RECT(x, y, w, h,
obj->cur.clipper->cur.cache.clip.x,
obj->cur.clipper->cur.cache.clip.y,
obj->cur.clipper->cur.cache.clip.w,
obj->cur.clipper->cur.cache.clip.h);
}
e->engine.func->output_redraws_rect_del(e->engine.data.output, e->engine.func->output_redraws_rect_del(e->engine.data.output,
obj->cur.cache.clip.x, x, y, w, h);
obj->cur.cache.clip.y,
obj->cur.cache.clip.w,
obj->cur.cache.clip.h);
} }
static void static void