forked from enlightenment/efl
parent
3db87e69bb
commit
4e5f9b850f
|
@ -19708,13 +19708,6 @@ extern "C" {
|
||||||
* @return The top object or NULL if none
|
* @return The top object or NULL if none
|
||||||
*/
|
*/
|
||||||
EAPI Evas_Object *elm_pager_content_top_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
|
EAPI Evas_Object *elm_pager_content_top_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
|
||||||
/**
|
|
||||||
* @brief Enable or disable pager animations
|
|
||||||
*
|
|
||||||
* @param obj The pager object
|
|
||||||
* @param disable True if the animation should be disabled
|
|
||||||
*/
|
|
||||||
EAPI void elm_pager_animation_disabled_set(Evas_Object *obj, Eina_Bool disable); EINA_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @}
|
* @}
|
||||||
|
|
|
@ -9,7 +9,6 @@ struct _Widget_Data
|
||||||
Eina_List *stack;
|
Eina_List *stack;
|
||||||
Item *top, *oldtop;
|
Item *top, *oldtop;
|
||||||
Evas_Object *rect, *clip;
|
Evas_Object *rect, *clip;
|
||||||
Eina_Bool disable_animation: 1;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _Item
|
struct _Item
|
||||||
|
@ -145,7 +144,6 @@ static void
|
||||||
_eval_top(Evas_Object *obj)
|
_eval_top(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
Eina_Bool show_noanimate = EINA_TRUE;
|
|
||||||
Item *ittop;
|
Item *ittop;
|
||||||
if (!wd) return;
|
if (!wd) return;
|
||||||
if (!wd->stack) return;
|
if (!wd->stack) return;
|
||||||
|
@ -158,13 +156,7 @@ _eval_top(Evas_Object *obj)
|
||||||
if (wd->top)
|
if (wd->top)
|
||||||
{
|
{
|
||||||
o = wd->top->base;
|
o = wd->top->base;
|
||||||
if(wd->disable_animation)
|
if (wd->top->popme)
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
{
|
||||||
edje_object_signal_emit(o, "elm,action,pop", "elm");
|
edje_object_signal_emit(o, "elm,action,pop", "elm");
|
||||||
wd->stack = eina_list_remove(wd->stack, wd->top);
|
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 if (!strcmp(onhide, "lower")) evas_object_lower(o);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
show_noanimate = EINA_FALSE;
|
|
||||||
}
|
|
||||||
wd->oldtop = wd->top;
|
wd->oldtop = wd->top;
|
||||||
wd->top = ittop;
|
wd->top = ittop;
|
||||||
o = wd->top->base;
|
o = wd->top->base;
|
||||||
evas_object_show(o);
|
evas_object_show(o);
|
||||||
if ((!show_noanimate)||(wd->disable_animation))
|
if (wd->oldtop)
|
||||||
{
|
|
||||||
edje_object_signal_emit(o, "elm,action,show,noanimate", "elm");
|
|
||||||
}
|
|
||||||
else if (wd->oldtop)
|
|
||||||
{
|
{
|
||||||
if (elm_object_focus_get(wd->oldtop->content))
|
if (elm_object_focus_get(wd->oldtop->content))
|
||||||
elm_widget_focused_object_clear(wd->oldtop->content);
|
elm_widget_focused_object_clear(wd->oldtop->content);
|
||||||
|
@ -449,19 +433,3 @@ elm_pager_content_top_get(const Evas_Object *obj)
|
||||||
if (!wd->top) return NULL;
|
if (!wd->top) return NULL;
|
||||||
return wd->top->content;
|
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);
|
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
|
||||||
wd->disable_animation = disable;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue