From cb96f2abc6d0ea364adfcc57f8e455a336981fc6 Mon Sep 17 00:00:00 2001 From: seoz Date: Fri, 16 Mar 2012 08:24:43 +0000 Subject: [PATCH] [Genlist] elm genlist: Refactoring. Use correct name item_moving_effect_timer -> tree_effect_animator. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69453 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 Conflicts: src/lib/elm_genlist.c --- src/lib/elm_gen_common.h | 2 +- src/lib/elm_genlist.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h index 7fd3940..e3cb920 100644 --- a/src/lib/elm_gen_common.h +++ b/src/lib/elm_gen_common.h @@ -166,7 +166,7 @@ struct _Widget_Data Evas_Object *alpha_bg; /**< not to receive event when tree effect is not finished */ Eina_List *move_items; /**< items move for tree effect */ Elm_Gen_Item *expanded_next_item; - Ecore_Animator *item_moving_effect_timer; /**< tree effect */ + Ecore_Animator *tree_effect_animator; /**< tree effect animator */ Elm_Genlist_Item_Move_Effect_Mode move_effect_mode; Ecore_Job *changed_job; diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 316842a..8e00443 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -181,7 +181,7 @@ static void _item_contract_emit(Elm_Gen_Item *it); static int _item_tree_effect_before(Elm_Gen_Item *it); static void _item_tree_effect(Widget_Data *wd, int y); static void _item_tree_effect_finish(Widget_Data *wd); -static Eina_Bool _item_moving_effect_timer_cb(void *data); +static Eina_Bool _tree_effect_animator_cb(void *data); static Evas_Smart_Class _pan_sc = EVAS_SMART_CLASS_INIT_VERSION; @@ -2764,7 +2764,7 @@ _item_block_position(Item_Block *itb, } else { - if (!it->wd->item_moving_effect_timer) + if (!it->wd->tree_effect_animator) _elm_genlist_item_unrealize(it, EINA_FALSE); } } @@ -5114,14 +5114,14 @@ elm_genlist_item_subitems_clear(Elm_Object_Item *it) _item_subitems_clear(_it); else { - if (!wd->item_moving_effect_timer) + if (!wd->tree_effect_animator) { wd->expanded_item = _it; _item_tree_effect_before(_it); evas_object_raise(wd->alpha_bg); evas_object_show(wd->alpha_bg); wd->start_time = ecore_time_get(); - wd->item_moving_effect_timer = ecore_animator_add(_item_moving_effect_timer_cb, wd); + wd->tree_effect_animator = ecore_animator_add(_tree_effect_animator_cb, wd); } else _item_subitems_clear(_it); @@ -6430,7 +6430,7 @@ _item_tree_effect_finish(Widget_Data *wd) Elm_Gen_Item *it = NULL; const Eina_List *l; - if (wd->item_moving_effect_timer) + if (wd->tree_effect_animator) { if (wd->move_effect_mode == ELM_GENLIST_TREE_EFFECT_CONTRACT) _item_subitems_clear(wd->expanded_item); @@ -6452,11 +6452,11 @@ _item_tree_effect_finish(Widget_Data *wd) evas_object_smart_callback_call(wd->obj, SIG_TREE_EFFECT_FINISHED, NULL); evas_object_smart_changed(wd->pan_smart); - wd->item_moving_effect_timer = NULL; + wd->tree_effect_animator = NULL; } static Eina_Bool -_item_moving_effect_timer_cb(void *data) +_tree_effect_animator_cb(void *data) { Widget_Data *wd = data; if (!wd) return EINA_FALSE; -- 2.7.4