From 6df3389759ee872e82a3fb1faf839f0d46dc8f67 Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Sat, 10 Jul 2010 20:38:29 +0900 Subject: [PATCH] [elm_softkey.c] Removed the animation for softkey buttons. Deleted the animator once panel animation is done and also when panel is deleted. --- src/lib/elm_softkey.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_softkey.c b/src/lib/elm_softkey.c index 3c52b00..b647844 100644 --- a/src/lib/elm_softkey.c +++ b/src/lib/elm_softkey.c @@ -271,6 +271,7 @@ static int _panel_up_animator_cb(void *data) if (!wd->animator) return 0; ecore_animator_del(wd->animator); + wd->animator = NULL; wd->animating = EINA_FALSE; wd->show_panel = EINA_TRUE; progress = 0; @@ -304,8 +305,9 @@ static int _panel_down_animator_cb(void *data) if (!wd->animator) return 0; ecore_animator_del(wd->animator); + wd->animator = NULL; wd->animating = EINA_FALSE; - wd->animator = ecore_animator_add(_show_button_animator_cb, data); + //wd->animator = ecore_animator_add(_show_button_animator_cb, data); wd->show_panel = EINA_FALSE; progress = 0; @@ -426,8 +428,11 @@ static void _more_btn_click_cb(void *data, Evas_Object *obj, const char *emissio evas_object_show(wd->bg_rect); } - if (wd->animating == EINA_FALSE) { + /*if (wd->animating == EINA_FALSE) { wd->animator = ecore_animator_add(_hide_button_animator_cb, data); + }*/ + if (wd->animating == EINA_FALSE) { + wd->animator = ecore_animator_add(_panel_up_animator_cb, data); } } @@ -1170,6 +1175,11 @@ EAPI int elm_softkey_panel_del(Evas_Object *obj) return -1; if (wd->panel == NULL) return -1; + if(wd->animator) { + ecore_animator_del(wd->animator); + wd->animator = NULL; + wd->animating=EINA_FALSE; + } for (i = 1; i <= wd->panel_btn_idx; i++) { sprintf(button_name, "panel_button_area_%d", i); -- 2.7.4