projects
/
framework
/
uifw
/
elementary.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
elementary - removed deprecated widgets & APIs.
[framework/uifw/elementary.git]
/
src
/
lib
/
elm_pager.c
diff --git
a/src/lib/elm_pager.c
b/src/lib/elm_pager.c
index
e721a3c
..
8f1073d
100644
(file)
--- 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_List *stack;
Item *top, *oldtop;
Evas_Object *rect, *clip;
- Eina_Bool disable_animation: 1;
};
struct _Item
};
struct _Item
@@
-145,7
+144,6
@@
static void
_eval_top(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
_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;
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->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);
{
edje_object_signal_emit(o, "elm,action,pop", "elm");
wd->stack = eina_list_remove(wd->stack, wd->top);
@@
-178,22
+170,14
@@
_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->top = ittop;
o = wd->top->base;
evas_object_show(o);
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))
{
if (elm_object_focus_get(wd->oldtop->content))
- elm_
object_focus_set(wd->top->content, EINA_TRUE
);
+ elm_
widget_focused_object_clear(wd->oldtop->content
);
if (wd->oldtop->popme)
edje_object_signal_emit(o, "elm,action,show", "elm");
else
if (wd->oldtop->popme)
edje_object_signal_emit(o, "elm,action,show", "elm");
else
@@
-488,11
+472,3
@@
elm_pager_content_top_get(const Evas_Object *obj)
if (!wd->top) return NULL;
return wd->top->content;
}
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;
-}