X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_pager.c;h=8f1073db0b387822e0f5d073448aed32ee99d222;hb=e18f15c48a1be6ccc2a2c79ad69564883a418469;hp=0583593ff9890774974a1aae2c947e2234f4535e;hpb=b09a0c8d8a0000a10ada64394e2bdc9c97a55bdb;p=framework%2Fuifw%2Felementary.git diff --git a/src/lib/elm_pager.c b/src/lib/elm_pager.c index 0583593..8f1073d 100644 --- a/src/lib/elm_pager.c +++ b/src/lib/elm_pager.c @@ -1,30 +1,6 @@ #include #include "elm_priv.h" -/** - * @defgroup Pager Pager - * - * The pager is an object that allows flipping (with animation) between 1 or - * more “pages” of objects, much like a stack of windows within the window. - * - * Objects can be pushed or popped from the stack or deleted as normal. - * Pushes and pops will animate (and a pop will delete the object once the - * animation is finished). Any object in the pager can be promoted to the top - * (from its current stacking position) as well. Objects are pushed to the - * top with elm_pager_content_push() and when the top item is no longer - * wanted, simply pop it with elm_pager_content_pop() and it will also be - * deleted. Any object you wish to promote to the top that is already in the - * pager, simply use elm_pager_content_promote(). If an object is no longer - * needed and is not the top item, just delete it as normal. You can query - * which objects are the top and bottom with elm_pager_content_bottom_get() - * and elm_pager_content_top_get(). - * - * Signals that you can add callbacks for are: - * - * "hide,finished" - when the previous page is hided - * - */ - typedef struct _Widget_Data Widget_Data; typedef struct _Item Item; @@ -33,7 +9,6 @@ struct _Widget_Data Eina_List *stack; Item *top, *oldtop; Evas_Object *rect, *clip; - Eina_Bool disable_animation: 1; }; struct _Item @@ -169,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; @@ -182,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); @@ -202,22 +170,14 @@ _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_object_focus(wd->top->content); + elm_widget_focused_object_clear(wd->oldtop->content); if (wd->oldtop->popme) edje_object_signal_emit(o, "elm,action,show", "elm"); else @@ -308,14 +268,6 @@ _signal_hide_finished(void *data, Evas_Object *obj __UNUSED__, const char *emiss _sizing_eval(obj2); } -/** - * Add a new pager to the parent - * - * @param parent The parent object - * @return The new object or NULL if it cannot be created - * - * @ingroup Pager - */ EAPI Evas_Object * elm_pager_add(Evas_Object *parent) { @@ -353,18 +305,6 @@ elm_pager_add(Evas_Object *parent) return obj; } -/** - * Push an object to the top of the pager stack (and show it) - * - * The object pushed becomes a child of the pager and will be controlled - * it and deleted when the pager is deleted. - * - * @param obj The pager object - * @param content The object to push - * - * @ingroup Pager - * @warning It will be failed if the content exists on the stack already. - */ EAPI void elm_pager_content_push(Evas_Object *obj, Evas_Object *content) { @@ -415,17 +355,6 @@ elm_pager_content_push(Evas_Object *obj, Evas_Object *content) _sizing_eval(obj); } -/** - * Pop the object that is on top of the stack - * - * This pops the object that is on top (visible) in the pager, makes it - * disappear, then deletes the object. The object that was underneath it - * on the stack will become visible. - * - * @param obj The pager object - * - * @ingroup Pager - */ EAPI void elm_pager_content_pop(Evas_Object *obj) { @@ -473,17 +402,6 @@ _del_job(void *data) evas_object_del(obj); } -/** - * Pop to the object that is on the stack - * - * This pops the objects that are on the stack, makes them - * disappear, then deletes the objects. The content will become visible. - * - * @param obj The pager object - * @param content The object to show - * - * @ingroup Pager - */ EAPI void elm_pager_to_content_pop(Evas_Object *obj, Evas_Object *content) { @@ -509,25 +427,13 @@ elm_pager_to_content_pop(Evas_Object *obj, Evas_Object *content) } else break; - + ll = ll->prev; } } _eval_top(it->obj); } -/** - * Promote an object already in the pager stack to the top of the stack - * - * This will take the indicated object and promote it to the top of the stack - * as if it had been pushed there. The object must already be inside the - * pager stack to work. - * - * @param obj The pager object - * @param content The object to promote - * - * @ingroup Pager - */ EAPI void elm_pager_content_promote(Evas_Object *obj, Evas_Object *content) { @@ -545,14 +451,6 @@ elm_pager_content_promote(Evas_Object *obj, Evas_Object *content) _eval_top(obj); } -/** - * Return the object at the bottom of the pager stack - * - * @param obj The pager object - * @return The bottom object or NULL if none - * - * @ingroup Pager - */ EAPI Evas_Object * elm_pager_content_bottom_get(const Evas_Object *obj) { @@ -565,14 +463,6 @@ elm_pager_content_bottom_get(const Evas_Object *obj) return it->content; } -/** - * Return the object at the top of the pager stack - * - * @param obj The pager object - * @return The top object or NULL if none - * - * @ingroup Pager - */ EAPI Evas_Object * elm_pager_content_top_get(const Evas_Object *obj) { @@ -582,19 +472,3 @@ elm_pager_content_top_get(const Evas_Object *obj) if (!wd->top) return NULL; return wd->top->content; } - -/** - * This disables content animation on push/pop. - * - * @param obj The pager object - * @param disable if EINA_TRUE animation is disabled. - * - * @ingroup Pager - */ -EAPI void -elm_pager_animation_disabled_set(Evas_Object *obj, Eina_Bool disable) -{ - ELM_CHECK_WIDTYPE(obj, widtype)NULL; - Widget_Data *wd = elm_widget_data_get(obj); - wd->disable_animation = disable; -}