X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_pager.c;h=8f1073db0b387822e0f5d073448aed32ee99d222;hb=e18f15c48a1be6ccc2a2c79ad69564883a418469;hp=1bf242d18d47dc768a494c59ef7286ffa6a40108;hpb=772c6a5e975e362da0415b23b2162bd7e9c25e23;p=framework%2Fuifw%2Felementary.git diff --git a/src/lib/elm_pager.c b/src/lib/elm_pager.c index 1bf242d..8f1073d 100644 --- a/src/lib/elm_pager.c +++ b/src/lib/elm_pager.c @@ -9,7 +9,6 @@ struct _Widget_Data Eina_List *stack; Item *top, *oldtop; Evas_Object *rect, *clip; - Eina_Bool disable_animation: 1; }; struct _Item @@ -145,7 +144,6 @@ static void _eval_top(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Eina_Bool show_noanimate = EINA_TRUE; Item *ittop; if (!wd) return; if (!wd->stack) return; @@ -158,13 +156,7 @@ _eval_top(Evas_Object *obj) if (wd->top) { o = wd->top->base; - if(wd->disable_animation) - { - edje_object_signal_emit(o, "elm,action,hide,noanimate", "elm"); - if (wd->top->popme) - wd->stack = eina_list_remove(wd->stack, wd->top); - } - else if (wd->top->popme) + if (wd->top->popme) { edje_object_signal_emit(o, "elm,action,pop", "elm"); wd->stack = eina_list_remove(wd->stack, wd->top); @@ -178,19 +170,11 @@ _eval_top(Evas_Object *obj) else if (!strcmp(onhide, "lower")) evas_object_lower(o); } } - else - { - show_noanimate = EINA_FALSE; - } wd->oldtop = wd->top; wd->top = ittop; o = wd->top->base; evas_object_show(o); - if ((!show_noanimate)||(wd->disable_animation)) - { - edje_object_signal_emit(o, "elm,action,show,noanimate", "elm"); - } - else if (wd->oldtop) + if (wd->oldtop) { if (elm_object_focus_get(wd->oldtop->content)) elm_widget_focused_object_clear(wd->oldtop->content); @@ -488,11 +472,3 @@ elm_pager_content_top_get(const Evas_Object *obj) if (!wd->top) return NULL; return wd->top->content; } - -EAPI void -elm_pager_animation_disabled_set(Evas_Object *obj, Eina_Bool disable) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - wd->disable_animation = disable; -}