summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-04-30 14:18:41 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:30 +0300
commit5098a4f24bd8cc2bcbc1b99a8a19f29013441aff (patch)
tree23ef0ec4a694e7076c89c0d3d7108abb8e60fc76
parent96c0ab939ecfff6b2f828156234ab281aae9c40b (diff)
elm_flip: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_flip.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 29cd214c8..86088170f 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1333,7 +1333,7 @@ _flip(Evas_Object *obj)
1333 sd->state = sd->next_state; 1333 sd->state = sd->next_state;
1334 _configure(obj); 1334 _configure(obj);
1335 _flip_show_hide(obj); 1335 _flip_show_hide(obj);
1336 evas_object_smart_callback_call(obj, SIG_ANIMATE_DONE, NULL); 1336 eo_do(obj, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_DONE, NULL));
1337 1337
1338 return ECORE_CALLBACK_CANCEL; 1338 return ECORE_CALLBACK_CANCEL;
1339 } 1339 }
@@ -1514,8 +1514,8 @@ _event_anim(void *data,
1514 _flip_show_hide(sd->obj); 1514 _flip_show_hide(sd->obj);
1515 _configure(sd->obj); 1515 _configure(sd->obj);
1516 sd->animator = NULL; 1516 sd->animator = NULL;
1517 evas_object_smart_callback_call 1517 eo_do(sd->obj, eo_event_callback_call
1518 (sd->obj, SIG_ANIMATE_DONE, NULL); 1518 (ELM_FLIP_EVENT_ANIMATE_DONE, NULL));
1519 1519
1520 return ECORE_CALLBACK_CANCEL; 1520 return ECORE_CALLBACK_CANCEL;
1521} 1521}
@@ -1701,7 +1701,7 @@ _move_cb(void *data,
1701 evas_smart_objects_calculate(evas_object_evas_get(data)); 1701 evas_smart_objects_calculate(evas_object_evas_get(data));
1702 _configure(fl); 1702 _configure(fl);
1703 // FIXME: end hack 1703 // FIXME: end hack
1704 evas_object_smart_callback_call(fl, SIG_ANIMATE_BEGIN, NULL); 1704 eo_do(fl, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL));
1705 } 1705 }
1706 else return; 1706 else return;
1707 } 1707 }
@@ -1922,7 +1922,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
1922 evas_smart_objects_calculate(evas_object_evas_get(obj)); 1922 evas_smart_objects_calculate(evas_object_evas_get(obj));
1923 _configure(obj); 1923 _configure(obj);
1924 // FIXME: end hack 1924 // FIXME: end hack
1925 evas_object_smart_callback_call(obj, SIG_ANIMATE_BEGIN, NULL); 1925 eo_do(obj, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL));
1926 1926
1927 // set focus to the content object when flip go to is called 1927 // set focus to the content object when flip go to is called
1928 if (elm_object_focus_get(obj)) 1928 if (elm_object_focus_get(obj))