Hi Hermet,
There is a warning (line 1358) on a comparison between an Eo object and
a data object. Please fix it.
Thank you
JackDanielZ (alias Daniel)
On 05/07/2013 07:21 PM, ChunEon Park - Enlightenment Git wrote:
> hermet pushed a commit to branch master.
>
> commit b10be8fb4cf134e2ab0cc2e34b4aec4ff50a5382
> Author: ChunEon Park <chuneon.p...@samsung.com>
> Date: Wed May 8 01:16:49 2013 +0900
>
> evas/render - Fixed proxy clipping if the source object is clipped by
> output area.
>
> Before this patch, the proxy will be clipped if the source is clipped by
> output area even if the soure_clip is disabled,
>
> Additionally, src_clip/src_event/src_visible options must be supported
> in edje.
> ---
> src/lib/evas/canvas/evas_render.c | 69
> ++++++++++++++++++++-------------------
> 1 file changed, 35 insertions(+), 34 deletions(-)
>
> diff --git a/src/lib/evas/canvas/evas_render.c
> b/src/lib/evas/canvas/evas_render.c
> index 7c10b82..1da6380 100644
> --- a/src/lib/evas/canvas/evas_render.c
> +++ b/src/lib/evas/canvas/evas_render.c
> @@ -1027,7 +1027,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object
> *eo_obj,
>
> if (mapped)
> {
> - if (!proxy_obj || proxy_src_clip)
> + if (proxy_src_clip)
> {
> if ((!evas_object_is_visible(eo_obj, obj)) ||
> (obj->clip.clipees)
> || (obj->cur->have_clipees))
> @@ -1329,43 +1329,45 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object
> *eo_obj,
> {
> RDI(level);
>
> - //FIXME: Consider to clip by the proxy clipper.
> - if (obj->cur->clipper && (!proxy_obj || proxy_src_clip))
> + if (obj->cur->clipper)
> {
> - RD(" clip: %i %i %ix%i [%i %i %ix%i]\n",
> - obj->cur->cache.clip.x + off_x,
> - obj->cur->cache.clip.y + off_y,
> - obj->cur->cache.clip.w,
> - obj->cur->cache.clip.h,
> - obj->cur->geometry.x + off_x,
> - obj->cur->geometry.y + off_y,
> - obj->cur->geometry.w,
> - obj->cur->geometry.h);
> -
> - RD(" clipper: %i %i %ix%i\n",
> - obj->cur->clipper->cur->cache.clip.x + off_x,
> - obj->cur->clipper->cur->cache.clip.y + off_y,
> - obj->cur->clipper->cur->cache.clip.w,
> - obj->cur->clipper->cur->cache.clip.h);
> -
> int x, y, w, h;
>
> - if (_evas_render_has_map(eo_obj, obj))
> - evas_object_clip_recalc(obj);
> + if (proxy_src_clip)
> + {
> + if (_evas_render_has_map(eo_obj, obj))
> + evas_object_clip_recalc(obj);
>
> - x = obj->cur->cache.clip.x + off_x;
> - y = obj->cur->cache.clip.y + off_y;
> - w = obj->cur->cache.clip.w;
> - h = obj->cur->cache.clip.h;
> + x = obj->cur->cache.clip.x + off_x;
> + y = obj->cur->cache.clip.y + off_y;
> + w = obj->cur->cache.clip.w;
> + h = obj->cur->cache.clip.h;
>
> - RECTS_CLIP_TO_RECT(x, y, w, h,
> -
> obj->cur->clipper->cur->cache.clip.x + off_x,
> -
> obj->cur->clipper->cur->cache.clip.y + off_y,
> -
> obj->cur->clipper->cur->cache.clip.w,
> -
> obj->cur->clipper->cur->cache.clip.h);
> + RECTS_CLIP_TO_RECT(x, y, w, h,
> +
> obj->cur->clipper->cur->cache.clip.x + off_x,
> +
> obj->cur->clipper->cur->cache.clip.y + off_y,
> +
> obj->cur->clipper->cur->cache.clip.w,
> +
> obj->cur->clipper->cur->cache.clip.h);
>
> -
> e->engine.func->context_clip_set(e->engine.data.output,
> - ctx, x, y, w, h);
> +
> e->engine.func->context_clip_set(e->engine.data.output,
> + ctx, x, y, w,
> h);
> + }
> + else
> + {
> + //FIXME: Consider to clip by the proxy clipper.
> + if (proxy_obj && (proxy_obj != obj))
> + {
> + if (_evas_render_has_map(eo_obj, obj))
> + evas_object_clip_recalc(obj);
> +
> + x = obj->cur->clipper->cur->geometry.x +
> off_x;
> + y = obj->cur->clipper->cur->geometry.y +
> off_y;
> + w = obj->cur->clipper->cur->geometry.w;
> + h = obj->cur->clipper->cur->geometry.h;
> +
> e->engine.func->context_clip_set(e->engine.data.output,
> + ctx, x, y,
> w, h);
> + }
> + }
> }
> obj->func->render(eo_obj, obj, e->engine.data.output, ctx,
> surface, off_x, off_y, EINA_FALSE);
> @@ -1374,8 +1376,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object
> *eo_obj,
> }
> else
> {
> - //FIXME: Consider to clip by the proxy clipper.
> - if (obj->cur->clipper && (!proxy_obj || proxy_src_clip))
> + if (obj->cur->clipper)
> {
> int x, y, w, h;
>
>
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
