dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas masking: Fix masking of multiple objects in a map 

All those masking bug fixes become harder to explain. But here goes:

 - Take a genlist, apply a mask to it (for example put everything
   in an elm_layout). Also play with various objects in the genlist.
 - Also apply a map to it (for instance, elm_transit zoom).

 --> Now some elements will be masked, some others will not,
     and some may even not render at all.

This patch restores a mask in the current drawing context, instead
of just unsetting it.
This commit is contained in:
Jean-Philippe Andre 2015-02-03 17:32:59 +09:00
parent 5fb43d3559
commit fbacbf7350
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib/evas/canvas/evas_render.c
View File

@ -1494,6 +1494,10 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
if (mapped)
{
Eina_Bool restore_image_clip = EINA_FALSE;
void *oldm_sfc = NULL;
int oldm_x = 0, oldm_y = 0;
RDI(level);
RD(" draw child of mapped obj\n");
if (use_mapped_ctx)
@ -1502,8 +1506,6 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
ctx = e->engine.func->context_new(e->engine.data.output);
if (obj->is_smart)
{
Eina_Bool unset_image_clip = EINA_FALSE;
/* Clipper masks */
if (obj->cur->clipper &&
_evas_render_object_is_mask(obj->cur->clipper))
@ -1518,7 +1520,10 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
if (mask->mask->surface)
{
unset_image_clip = EINA_TRUE;
restore_image_clip = EINA_TRUE;
e->engine.func->context_clip_image_get
(e->engine.data.output, ctx,
&oldm_sfc, &oldm_x, &oldm_y);
e->engine.func->context_clip_image_set
(e->engine.data.output, ctx,
mask->mask->surface,
@ -1536,7 +1541,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
ecx, ecy, ecw, ech,
proxy_render_data,
level + 1,
unset_image_clip | use_mapped_ctx,
restore_image_clip | use_mapped_ctx,
do_async);
/* We aren't sure this object will be rendered by
normal(not proxy) drawing after, we reset this
@ -1546,16 +1551,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
if (!proxy_render_data)
evas_object_change_reset(obj2->object);
}
if (unset_image_clip)
{
e->engine.func->context_clip_image_unset
(e->engine.data.output, ctx);
}
}
else
{
Eina_Bool unset_image_clip = EINA_FALSE;
RDI(level);
if (obj->cur->clipper)
@ -1577,7 +1575,10 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
if (mask->mask->surface)
{
unset_image_clip = EINA_TRUE;
restore_image_clip = EINA_TRUE;
e->engine.func->context_clip_image_get
(e->engine.data.output, ctx,
&oldm_sfc, &oldm_x, &oldm_y);
e->engine.func->context_clip_image_set
(e->engine.data.output, ctx,
mask->mask->surface,
@ -1589,11 +1590,11 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
obj->func->render(eo_obj, obj, obj->private_data,
e->engine.data.output, ctx,
surface, off_x, off_y, EINA_FALSE);
if (unset_image_clip)
{
e->engine.func->context_clip_image_unset
(e->engine.data.output, ctx);
}
}
if (restore_image_clip)
{
e->engine.func->context_clip_image_set
(e->engine.data.output, ctx, oldm_sfc, oldm_x, oldm_y);
}
if (!use_mapped_ctx)
e->engine.func->context_free(e->engine.data.output, ctx);