enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas: PRoxy: First pass at punching through hidden clips. 

SVN revision: 58009
This commit is contained in:
Brett Nash 2011-03-23 01:37:14 +00:00
parent 385e1b08f2
commit fc2c613bec
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/ChangeLog
View File

@ -187,3 +187,8 @@
inode number, size, and on linux, the nanonsecond resolution
timestamp as well.
2011-03-19 Brett Nash (nash)
* Proxy: Bypass the clip on smart clipped objects. This is probably
what you want if you are using proxies, as it means clips don't cause
the object to be invisible by the proxy.

21
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -2513,19 +2513,29 @@ _proxy_error(Evas_Object *proxy, void *context, void *output, void *surface,
return;
}
static void
_proxy_subrender_recurse(Evas_Object *obj, void *output, void *surface, void *ctx, int x, int y){
_proxy_subrender_recurse(Evas_Object *obj, Evas_Object *clip, void *output, void *surface, void *ctx, int x, int y){
Evas_Object *obj2;
Evas *e;
e = obj->layer->evas;
if (obj->clip.clipees) return;
if (!evas_object_is_visible(obj)) return;
/* evas_object_is_visible, inline and tweaked to handle it's clip hidden*/
if (!obj->cur.visible) return;
if (!clip || clip != obj->cur.clipper)
{
if (!obj->cur.cache.clip.visible) return;
if (obj->cur.cache.clip.a == 0 &&
obj->cur.render_op == EVAS_RENDER_BLEND) return;
}
if (obj->func->is_visible && !obj->func->is_visible(obj)) return;
obj->pre_render_done = 1;
ctx = e->engine.func->context_new(output);
if (obj->smart.smart)
{
EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2){
_proxy_subrender_recurse(obj2, output, surface, ctx, x,y);
_proxy_subrender_recurse(obj2, clip, output, surface, ctx, x,y);
}
}
else
@ -2546,7 +2556,7 @@ static void
_proxy_subrender(Evas *e, Evas_Object *source)
{
void *ctx;
Evas_Object *obj2;
Evas_Object *obj2, *clip;
int w,h;
if (!source) return;
@ -2584,8 +2594,9 @@ _proxy_subrender(Evas *e, Evas_Object *source)
ctx = e->engine.func->context_new(e->engine.data.output);
if (source->smart.smart)
{
clip = evas_object_smart_clipped_clipper_get(source);
EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(source), obj2){
_proxy_subrender_recurse(obj2, e->engine.data.output,
_proxy_subrender_recurse(obj2, clip, e->engine.data.output,
source->proxy.surface,
ctx,
-source->cur.geometry.x,