From af1030a8988828c32b92e160d96de293a405e140 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Sat, 14 Jan 2012 03:45:46 +0000 Subject: [PATCH] do smart callback after collapse registers so that collapsed_get() returns the correct value git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@67201 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_frame.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c index b2eda9e..82310e4 100644 --- a/src/lib/elm_frame.c +++ b/src/lib/elm_frame.c @@ -196,7 +196,6 @@ _content_unset_hook(Evas_Object *obj, const char *part) static void _recalc(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -// printf("recalc %3.3f\n", ecore_loop_time_get()); _sizing_eval(data); } @@ -205,7 +204,6 @@ _recalc_done(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__ { Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; -// printf("recalc done %3.3f\n", ecore_loop_time_get()); evas_object_smart_callback_del(wd->frm, "recalc", _recalc); wd->anim = EINA_FALSE; _sizing_eval(data); @@ -217,13 +215,14 @@ _signal_click(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED_ Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; if (wd->anim) return; + if (wd->collapsible) + { + evas_object_smart_callback_add(wd->frm, "recalc", _recalc, data); + edje_object_signal_emit(wd->frm, "elm,action,toggle", "elm"); + wd->collapsed++; + wd->anim = EINA_TRUE; + } evas_object_smart_callback_call(data, SIG_CLICKED, NULL); - if (!wd->collapsible) return; -// printf("recalc begin %3.3f\n", ecore_loop_time_get()); - evas_object_smart_callback_add(wd->frm, "recalc", _recalc, data); - edje_object_signal_emit(wd->frm, "elm,action,toggle", "elm"); - wd->collapsed++; - wd->anim = EINA_TRUE; } EAPI Evas_Object * -- 2.7.4