enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

do smart callback after collapse registers so that collapsed_get() returns the correct value 

SVN revision: 67201
This commit is contained in:
Mike Blumenkrantz 2012-01-14 03:45:46 +00:00
parent 2c71dea014
commit bce3f15937
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/elementary/src/lib/elm_frame.c
View File

@ -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 *