aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-05-01 00:07:27 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-05-01 00:13:56 +0900
commite9b61a89698f20f6d32689a362e9a36d37a2e496 (patch)
treed43af64088f74bc4d4c1fe20620b935399c7f706 /src
parentefl_canvas_object: Remove unnecessary import (diff)
downloadefl-e9b61a89698f20f6d32689a362e9a36d37a2e496.tar.gz
efl_canvas_object: Change name of animation event info
Change name of animation event info to synchronize with other event info names. Change data name in animation event info to synchronize with data type name, Efl.Event.Description.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_stack.c6
-rw-r--r--src/lib/evas/Evas_Eo.h6
-rw-r--r--src/lib/evas/canvas/evas_object_main.c12
3 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/elementary/efl_ui_stack.c b/src/lib/elementary/efl_ui_stack.c
index 74bcdf24ad..0c30501d62 100644
--- a/src/lib/elementary/efl_ui_stack.c
+++ b/src/lib/elementary/efl_ui_stack.c
@@ -78,12 +78,12 @@ static void
_anim_ended_cb(void *data, const Efl_Event *event)
{
Transit_Data *td = data;
- Efl_Canvas_Object_Animation_Event_Info *anim_event = event->info;
+ Efl_Canvas_Object_Animation_Event *anim_event = event->info;
//Unset animation because originally there is no animation.
if (!td->orig_anim)
efl_canvas_object_event_animation_set(event->object,
- anim_event->event_type, NULL);
+ anim_event->event_desc, NULL);
efl_canvas_object_freeze_events_set(event->object,
td->freeze_events);
@@ -91,7 +91,7 @@ _anim_ended_cb(void *data, const Efl_Event *event)
td->cd->on_pushing = EINA_FALSE;
td->cd->on_popping = EINA_FALSE;
- if (anim_event->event_type == EFL_GFX_ENTITY_EVENT_SHOW)
+ if (anim_event->event_desc == EFL_GFX_ENTITY_EVENT_SHOW)
{
//Activated Event
Efl_Ui_Stack_Event_Activated activated_info;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 63342368a6..bdd01e60da 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -136,10 +136,10 @@ struct _Efl_Canvas_Animation_Player_Event_Running
double progress;
};
-typedef struct Efl_Canvas_Object_Animation_Event_Info
+typedef struct Efl_Canvas_Object_Animation_Event
{
- const Efl_Event_Description *event_type;
-} Efl_Canvas_Object_Animation_Event_Info;
+ const Efl_Event_Description *event_desc;
+} Efl_Canvas_Object_Animation_Event;
/**
* @ingroup Evas_Object_Rectangle
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8f2edafafe..d4a2040e84 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -172,8 +172,8 @@ _anim_started_cb(void *data, const Efl_Event *ev)
{
const Efl_Event_Description *desc = data;
- Efl_Canvas_Object_Animation_Event_Info event;
- event.event_type = desc;
+ Efl_Canvas_Object_Animation_Event event;
+ event.event_desc = desc;
Eo *eo_obj = efl_animation_player_target_get(ev->object);
@@ -186,8 +186,8 @@ _anim_running_cb(void *data, const Efl_Event *ev)
{
const Efl_Event_Description *desc = data;
- Efl_Canvas_Object_Animation_Event_Info event;
- event.event_type = desc;
+ Efl_Canvas_Object_Animation_Event event;
+ event.event_desc = desc;
Eo *eo_obj = efl_animation_player_target_get(ev->object);
@@ -207,8 +207,8 @@ _anim_ended_cb(void *data, const Efl_Event *ev)
efl_event_callback_del(ev->object, EFL_ANIMATION_PLAYER_EVENT_ENDED,
_anim_ended_cb, desc);
- Efl_Canvas_Object_Animation_Event_Info event;
- event.event_type = desc;
+ Efl_Canvas_Object_Animation_Event event;
+ event.event_desc = desc;
Eo *eo_obj = efl_animation_player_target_get(ev->object);