summaryrefslogtreecommitdiff
path: root/src/bin/elementary
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-11-11 16:38:08 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-11-20 09:58:23 +0100
commit9bb2df996642f046f79466cff8fefcd43d28921e (patch)
treec8d839ba06978245dc0fd9e5aab86e4ddb8ce31e /src/bin/elementary
parentdb68e45fede1fa9056ebfcac8ebd7ca320a28a54 (diff)
Unify "animated" flags
There exist several flags to indicate whether an object should be animated, with inconsistent names: Efl.Canvas.Layout.animation: bool indicating if Edje animations should be played Efl.Ui.Spotlight_Manager.animation_enabled: bool indicating if page transitions should be animated Efl.Canvas.Animation_Player.animation: Efl.Canvas.Animation object This commit unifies all of them: "animated" is now a flag, and "animation" is an object. Note: Animation_Player is in the process of being replaced by an "animation" property in the Efl.Canvas.Object, hence the need for non-clashing animation flags. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10645
Diffstat (limited to 'src/bin/elementary')
-rw-r--r--src/bin/elementary/test_ui_spotlight.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/elementary/test_ui_spotlight.c b/src/bin/elementary/test_ui_spotlight.c
index a41ab69..fe095ab 100644
--- a/src/bin/elementary/test_ui_spotlight.c
+++ b/src/bin/elementary/test_ui_spotlight.c
@@ -513,7 +513,7 @@ _animation_cb(void *data, const Efl_Event *ev)
513{ 513{
514 Params *params = data; 514 Params *params = data;
515 515
516 efl_ui_spotlight_manager_animation_enabled_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_selectable_selected_get(ev->object)); 516 efl_ui_spotlight_manager_animated_transition_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_selectable_selected_get(ev->object));
517} 517}
518 518
519static void 519static void
@@ -536,7 +536,7 @@ view_animation_cb(void *data,
536 536
537 ck = efl_add(EFL_UI_CHECK_CLASS, box); 537 ck = efl_add(EFL_UI_CHECK_CLASS, box);
538 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, _animation_cb, params); 538 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, _animation_cb, params);
539 efl_ui_selectable_selected_set(ck, efl_ui_spotlight_manager_animation_enabled_get(efl_ui_spotlight_manager_get(params->spotlight))); 539 efl_ui_selectable_selected_set(ck, efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(params->spotlight)));
540 efl_text_set(ck, "Animation"); 540 efl_text_set(ck, "Animation");
541 efl_pack_end(box, ck); 541 efl_pack_end(box, ck);
542 efl_gfx_entity_visible_set(ck, 1); 542 efl_gfx_entity_visible_set(ck, 1);