summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-10-19 16:04:12 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-10-19 16:32:26 -0700
commitdad34967dfc5d1a29bb1ffe1060039d8ee4f2ffe (patch)
tree2457a9fc3608188413915cd816a7c90765e6699e /src/lib/evas
parentc0b2ae2cc8632ad89f3d7be999c8bc4812c00bdd (diff)
evas: propagate object data to evas_object_inform_call_show instead of fetching it again.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c3
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/include/evas_private.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index c0e8d30b58..86a5f6cee0 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -5,9 +5,8 @@
5/* local calls */ 5/* local calls */
6 6
7void 7void
8evas_object_inform_call_show(Evas_Object *eo_obj) 8evas_object_inform_call_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
9{ 9{
10 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
11 int event_id = _evas_object_event_new(); 10 int event_id = _evas_object_event_new();
12 11
13 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_EVENT_SHOW); 12 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_EVENT_SHOW);
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 464f657487..f4565ed7e3 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1948,7 +1948,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1948 } 1948 }
1949 } 1949 }
1950 evas_object_update_bounding_box(eo_obj, obj, NULL); 1950 evas_object_update_bounding_box(eo_obj, obj, NULL);
1951 evas_object_inform_call_show(eo_obj); 1951 evas_object_inform_call_show(eo_obj, obj);
1952 1952
1953 Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_EVENT_SHOW); 1953 Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_EVENT_SHOW);
1954 if (event_anim) 1954 if (event_anim)
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index dbaf8a1bf6..7fecfef916 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1740,7 +1740,7 @@ void evas_object_event_callback_all_del(Evas_Object *obj);
1740void evas_object_event_callback_cleanup(Evas_Object *obj); 1740void evas_object_event_callback_cleanup(Evas_Object *obj);
1741void evas_event_callback_all_del(Evas *e); 1741void evas_event_callback_all_del(Evas *e);
1742void evas_event_callback_cleanup(Evas *e); 1742void evas_event_callback_cleanup(Evas *e);
1743void evas_object_inform_call_show(Evas_Object *obj); 1743void evas_object_inform_call_show(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1744void evas_object_inform_call_hide(Evas_Object *obj); 1744void evas_object_inform_call_hide(Evas_Object *obj);
1745void evas_object_inform_call_move(Evas_Object *obj, Evas_Object_Protected_Data *pd); 1745void evas_object_inform_call_move(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1746void evas_object_inform_call_resize(Evas_Object *obj); 1746void evas_object_inform_call_resize(Evas_Object *obj);