From 644c43460c2fb7434b19626e40f60fe7de5a8a72 Mon Sep 17 00:00:00 2001 From: Brett Nash Date: Sun, 6 Feb 2011 23:50:19 +0000 Subject: [PATCH] Switch to a sub proxy sstructure. SVN revision: 56763 --- legacy/evas/src/lib/canvas/evas_object_proxy.c | 4 ++-- legacy/evas/src/lib/canvas/evas_render.c | 3 +++ legacy/evas/src/lib/include/evas_private.h | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_proxy.c b/legacy/evas/src/lib/canvas/evas_object_proxy.c index 33d30b8242..e088a72488 100644 --- a/legacy/evas/src/lib/canvas/evas_object_proxy.c +++ b/legacy/evas/src/lib/canvas/evas_object_proxy.c @@ -184,7 +184,7 @@ _proxy_unset(Evas_Object *proxy) o = proxy->object_data; if (!o->source) return; - o->source->proxies = eina_list_remove(o->source->proxies, proxy); + o->source->proxy.proxies = eina_list_remove(o->source->proxy.proxies, proxy); o->source = NULL; } @@ -200,7 +200,7 @@ _proxy_set(Evas_Object *proxy, Evas_Object *src) o->source = src; printf("Set %p\n",src); - src->proxies = eina_list_append(src->proxies, proxy); + src->proxy.proxies = eina_list_append(src->proxy.proxies, proxy); } diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c index 5e852142a3..0ea5ea6879 100644 --- a/legacy/evas/src/lib/canvas/evas_render.c +++ b/legacy/evas/src/lib/canvas/evas_render.c @@ -1681,3 +1681,6 @@ evas_render_object_recalc(Evas_Object *obj) obj->changed = 1; } } + + +/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h index fb7476d55e..1c11b80716 100644 --- a/legacy/evas/src/lib/include/evas_private.h +++ b/legacy/evas/src/lib/include/evas_private.h @@ -441,6 +441,10 @@ struct _Evas_Object Evas_Object *parent; } smart; + struct { + Eina_List *proxies; + } proxy; + Evas_Size_Hints *size_hints; int last_mouse_down_counter;