forked from enlightenment/efl
finally pager working how i like.. a little...
SVN revision: 39326
This commit is contained in:
parent
d1227d4099
commit
0290e9d631
|
@ -7823,8 +7823,10 @@ collections {
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
group { name: "elm/pager/base/default";
|
group { name: "elm/pager/base/default";
|
||||||
data.item: "stacking" "above";
|
data.item: "onshow" "raise";
|
||||||
data.item: "selectraise" "on";
|
// other options
|
||||||
|
// data.item: "onhide" "lower";
|
||||||
|
// data.item: "onshow" "lower";
|
||||||
images {
|
images {
|
||||||
image: "frame_1.png" COMP;
|
image: "frame_1.png" COMP;
|
||||||
image: "frame_2.png" COMP;
|
image: "frame_2.png" COMP;
|
||||||
|
@ -7920,12 +7922,12 @@ collections {
|
||||||
program { name: "hide_start";
|
program { name: "hide_start";
|
||||||
signal: "elm,action,hide";
|
signal: "elm,action,hide";
|
||||||
source: "elm";
|
source: "elm";
|
||||||
action: STATE_SET "hidden" 0.0;
|
action: STATE_SET "visible" 0.0;
|
||||||
target: "base";
|
target: "base";
|
||||||
after: "hide_start2";
|
after: "hide_start2";
|
||||||
}
|
}
|
||||||
program { name: "hide_start2";
|
program { name: "hide_start2";
|
||||||
action: STATE_SET "visible" 0.0;
|
action: STATE_SET "hidden" 0.0;
|
||||||
transition: DECELERATE 0.5;
|
transition: DECELERATE 0.5;
|
||||||
target: "base";
|
target: "base";
|
||||||
after: "hide_end";
|
after: "hide_end";
|
||||||
|
|
|
@ -2766,11 +2766,40 @@ my_bt_34(void *data, Evas_Object *obj, void *event_info)
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
typedef struct _Pginfo Pginfo;
|
||||||
|
|
||||||
|
struct _Pginfo
|
||||||
|
{
|
||||||
|
Evas_Object *pager, *pg1, *pg2, *pg3;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
my_pager_1(void *data, Evas_Object *obj, void *event_info)
|
||||||
|
{
|
||||||
|
Pginfo *info = data;
|
||||||
|
elm_pager_content_promote(info->pager, info->pg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
my_pager_2(void *data, Evas_Object *obj, void *event_info)
|
||||||
|
{
|
||||||
|
Pginfo *info = data;
|
||||||
|
elm_pager_content_promote(info->pager, info->pg3);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
my_pager_3(void *data, Evas_Object *obj, void *event_info)
|
||||||
|
{
|
||||||
|
Pginfo *info = data;
|
||||||
|
elm_pager_content_promote(info->pager, info->pg1);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
my_bt_35(void *data, Evas_Object *obj, void *event_info)
|
my_bt_35(void *data, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
Evas_Object *win, *bg, *pg, *bx, *bt;
|
Evas_Object *win, *bg, *pg, *bx, *lb, *bt;
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
|
static Pginfo info;
|
||||||
|
|
||||||
win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
|
win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
|
||||||
elm_win_title_set(win, "Pager");
|
elm_win_title_set(win, "Pager");
|
||||||
|
@ -2785,11 +2814,76 @@ my_bt_35(void *data, Evas_Object *obj, void *event_info)
|
||||||
elm_win_resize_object_add(win, pg);
|
elm_win_resize_object_add(win, pg);
|
||||||
evas_object_show(pg);
|
evas_object_show(pg);
|
||||||
|
|
||||||
|
info.pager = pg;
|
||||||
|
|
||||||
bx = elm_box_add(win);
|
bx = elm_box_add(win);
|
||||||
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
||||||
evas_object_show(bx);
|
evas_object_show(bx);
|
||||||
|
|
||||||
|
lb = elm_label_add(win);
|
||||||
|
elm_label_label_set(lb,
|
||||||
|
"This is page 1 in a pager stack.<br>"
|
||||||
|
"<br>"
|
||||||
|
"So what is a pager stack? It is a stack<br>"
|
||||||
|
"of pages that hold widgets in it. The<br>"
|
||||||
|
"pages can be pushed and popped on and<br>"
|
||||||
|
"off the stack, activated and otherwise<br>"
|
||||||
|
"activated if already in the stack<br>"
|
||||||
|
"(activated means promoted to the top of<br>"
|
||||||
|
"the stack).<br>"
|
||||||
|
"<br>"
|
||||||
|
"The theme may define the animation how<br>"
|
||||||
|
"show and hide of pages."
|
||||||
|
);
|
||||||
|
elm_box_pack_end(bx, lb);
|
||||||
|
evas_object_show(lb);
|
||||||
|
bt = elm_button_add(win);
|
||||||
|
elm_button_label_set(bt, "Flip to 2");
|
||||||
|
evas_object_smart_callback_add(bt, "clicked", my_pager_1, &info);
|
||||||
|
elm_box_pack_end(bx, bt);
|
||||||
|
evas_object_show(bt);
|
||||||
|
elm_pager_content_push(pg, bx);
|
||||||
|
info.pg1 = bx;
|
||||||
|
|
||||||
|
bx = elm_box_add(win);
|
||||||
|
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
||||||
|
evas_object_show(bx);
|
||||||
|
lb = elm_label_add(win);
|
||||||
|
elm_label_label_set(lb,
|
||||||
|
"This is page 2 in a pager stack.<br>"
|
||||||
|
"<br>"
|
||||||
|
"This is just like the previous page in<br>"
|
||||||
|
"the pager stack."
|
||||||
|
);
|
||||||
|
elm_box_pack_end(bx, lb);
|
||||||
|
evas_object_show(lb);
|
||||||
|
bt = elm_button_add(win);
|
||||||
|
elm_button_label_set(bt, "Flip to 3");
|
||||||
|
evas_object_smart_callback_add(bt, "clicked", my_pager_2, &info);
|
||||||
|
elm_box_pack_end(bx, bt);
|
||||||
|
evas_object_show(bt);
|
||||||
|
elm_pager_content_push(pg, bx);
|
||||||
|
info.pg2 = bx;
|
||||||
|
|
||||||
|
bx = elm_box_add(win);
|
||||||
|
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
||||||
|
evas_object_show(bx);
|
||||||
|
lb = elm_label_add(win);
|
||||||
|
elm_label_label_set(lb,
|
||||||
|
"This is page 3 in a pager stack.<br>"
|
||||||
|
"<br>"
|
||||||
|
"This is just like the previous page in<br>"
|
||||||
|
"the pager stack."
|
||||||
|
);
|
||||||
|
elm_box_pack_end(bx, lb);
|
||||||
|
evas_object_show(lb);
|
||||||
|
bt = elm_button_add(win);
|
||||||
|
elm_button_label_set(bt, "Flip to 1");
|
||||||
|
evas_object_smart_callback_add(bt, "clicked", my_pager_3, &info);
|
||||||
|
elm_box_pack_end(bx, bt);
|
||||||
|
evas_object_show(bt);
|
||||||
|
elm_pager_content_push(pg, bx);
|
||||||
|
info.pg3 = bx;
|
||||||
|
|
||||||
evas_object_resize(win, 320, 320);
|
evas_object_resize(win, 320, 320);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
|
|
|
@ -2,13 +2,18 @@
|
||||||
#include "elm_priv.h"
|
#include "elm_priv.h"
|
||||||
|
|
||||||
typedef struct _Widget_Data Widget_Data;
|
typedef struct _Widget_Data Widget_Data;
|
||||||
|
typedef struct _Item Item;
|
||||||
|
|
||||||
struct _Widget_Data
|
struct _Widget_Data
|
||||||
{
|
{
|
||||||
Evas_Object *base[2];
|
|
||||||
int swap;
|
|
||||||
Eina_List *stack;
|
Eina_List *stack;
|
||||||
Evas_Object *top, *oldtop;
|
Item *top, *oldtop;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _Item
|
||||||
|
{
|
||||||
|
Evas_Object *obj, *base, *content;
|
||||||
|
Evas_Coord minw, minh;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void _del_hook(Evas_Object *obj);
|
static void _del_hook(Evas_Object *obj);
|
||||||
|
@ -28,8 +33,10 @@ static void
|
||||||
_theme_hook(Evas_Object *obj)
|
_theme_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
edje_object_scale_set(wd->base[0], elm_widget_scale_get(obj) * _elm_config->scale);
|
Eina_List *l;
|
||||||
edje_object_scale_set(wd->base[1], elm_widget_scale_get(obj) * _elm_config->scale);
|
Item *it;
|
||||||
|
EINA_LIST_FOREACH(wd->stack, l, it)
|
||||||
|
edje_object_scale_set(it->base, elm_widget_scale_get(obj) * _elm_config->scale);
|
||||||
_sizing_eval(obj);
|
_sizing_eval(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,12 +45,13 @@ _sizing_eval(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
||||||
Evas_Coord minw2 = -1, minh2 = -1;
|
Eina_List *l;
|
||||||
|
Item *it;
|
||||||
edje_object_size_min_calc(wd->base[0], &minw, &minh);
|
EINA_LIST_FOREACH(wd->stack, l, it)
|
||||||
edje_object_size_min_calc(wd->base[1], &minw2, &minh2);
|
{
|
||||||
if (minw < minw2) minw = minw2;
|
if (it->minw > minw) minw = it->minw;
|
||||||
if (minh < minh2) minh = minh2;
|
if (it->minh > minh) minh = it->minh;
|
||||||
|
}
|
||||||
evas_object_size_hint_min_set(obj, minw, minh);
|
evas_object_size_hint_min_set(obj, minw, minh);
|
||||||
evas_object_size_hint_max_set(obj, maxw, maxh);
|
evas_object_size_hint_max_set(obj, maxw, maxh);
|
||||||
}
|
}
|
||||||
|
@ -52,6 +60,7 @@ static void
|
||||||
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(data);
|
Widget_Data *wd = elm_widget_data_get(data);
|
||||||
|
// FIXME: is a child changed size hints
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -59,30 +68,135 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
Evas_Object *sub = event_info;
|
Evas_Object *sub = event_info;
|
||||||
// FIXME: if sub is top of stack
|
// FIXME: handle del
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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);
|
||||||
Evas_Object *stacktop = elm_pager_content_top_get(obj);
|
Item *it, *ittop;
|
||||||
if (stacktop != wd->top)
|
if (!wd->stack) return;
|
||||||
|
ittop = eina_list_last(wd->stack)->data;
|
||||||
|
if (ittop != wd->top)
|
||||||
{
|
{
|
||||||
|
Evas_Object *o;
|
||||||
|
const char *onshow, *onhide;
|
||||||
|
|
||||||
|
if (wd->top)
|
||||||
|
{
|
||||||
|
o = wd->top->base;
|
||||||
|
edje_object_signal_emit(o, "elm,action,hide", "elm");
|
||||||
|
onhide = edje_object_data_get(o, "onhide");
|
||||||
|
if (onhide)
|
||||||
|
{
|
||||||
|
if (!strcmp(onhide, "raise")) evas_object_raise(o);
|
||||||
|
else if (!strcmp(onhide, "lower")) evas_object_lower(o);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
wd->top = ittop;
|
||||||
|
o = wd->top->base;
|
||||||
|
evas_object_show(o);
|
||||||
|
edje_object_signal_emit(o, "elm,action,show", "elm");
|
||||||
|
onshow = edje_object_data_get(o, "onshow");
|
||||||
|
if (onshow)
|
||||||
|
{
|
||||||
|
if (!strcmp(onshow, "raise")) evas_object_raise(o);
|
||||||
|
else if (!strcmp(onshow, "lower")) evas_object_lower(o);
|
||||||
|
}
|
||||||
|
#if 0
|
||||||
|
if (wd->oldtop)
|
||||||
|
{
|
||||||
|
evas_object_hide(wd->oldtop);
|
||||||
|
wd->oldtop = NULL;
|
||||||
|
}
|
||||||
|
printf("old top %p\n", wd->top);
|
||||||
wd->oldtop = wd->top;
|
wd->oldtop = wd->top;
|
||||||
wd->top = stacktop;
|
wd->top = stacktop;
|
||||||
// FIXME: transition from oldtop to top
|
// FIXME: transition from oldtop to top
|
||||||
edje_object_part_swallow(wd->base[1 - wd->swap], "elm.swallow.content", wd->top);
|
|
||||||
edje_object_signal_emit(wd->base[wd->swap], "elm,action,hide", "elm");
|
printf("hide %i\n", wd->swap);
|
||||||
edje_object_signal_emit(wd->base[1 - wd->swap], "elm,action,show", "elm");
|
o = wd->base[wd->swap];
|
||||||
|
edje_object_signal_emit(o, "elm,action,hide", "elm");
|
||||||
|
onhide = edje_object_data_get(o, "onhide");
|
||||||
|
if (onhide)
|
||||||
|
{
|
||||||
|
printf("onhide = %s\n", onhide);
|
||||||
|
if (!strcmp(onhide, "raise"))
|
||||||
|
{
|
||||||
|
printf("raise!\n");
|
||||||
|
evas_object_raise(o);
|
||||||
|
}
|
||||||
|
else if (!strcmp(onhide, "lower"))
|
||||||
|
{
|
||||||
|
printf("lower!\n");
|
||||||
|
evas_object_lower(o);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("show %i\n", 1 - wd->swap);
|
||||||
|
o = wd->base[1 - wd->swap];
|
||||||
|
printf("swallow %p into base %i\n", wd->top, 1 - wd->swap);
|
||||||
|
edje_object_part_swallow(o, "elm.swallow.content", wd->top);
|
||||||
|
evas_object_show(wd->top);
|
||||||
|
edje_object_signal_emit(o, "elm,action,show", "elm");
|
||||||
|
onshow = edje_object_data_get(o, "onshow");
|
||||||
|
if (onshow)
|
||||||
|
{
|
||||||
|
printf("onshow = %s\n", onshow);
|
||||||
|
if (!strcmp(onshow, "raise"))
|
||||||
|
{
|
||||||
|
printf("raise2!\n");
|
||||||
|
evas_object_raise(o);
|
||||||
|
}
|
||||||
|
else if (!strcmp(onshow, "lower"))
|
||||||
|
{
|
||||||
|
printf("lower2!\n");
|
||||||
|
evas_object_lower(o);
|
||||||
|
}
|
||||||
|
}
|
||||||
wd->swap = 1 - wd->swap;
|
wd->swap = 1 - wd->swap;
|
||||||
|
printf("swap = %i\n", wd->swap);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
|
{
|
||||||
|
Widget_Data *wd = elm_widget_data_get(data);
|
||||||
|
Evas_Coord x, y;
|
||||||
|
Eina_List *l;
|
||||||
|
Item *it;
|
||||||
|
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
|
||||||
|
EINA_LIST_FOREACH(wd->stack, l, it)
|
||||||
|
evas_object_move(it->base, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(data);
|
Widget_Data *wd = elm_widget_data_get(data);
|
||||||
|
Evas_Coord w, h;
|
||||||
|
Eina_List *l;
|
||||||
|
Item *it;
|
||||||
|
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
|
||||||
|
EINA_LIST_FOREACH(wd->stack, l, it)
|
||||||
|
evas_object_resize(it->base, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_signal_show_finished(void *data, Evas_Object *obj, const char *emission, const char *source)
|
||||||
|
{
|
||||||
|
Widget_Data *wd = elm_widget_data_get(data);
|
||||||
|
// finished show - don't really care
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_signal_hide_finished(void *data, Evas_Object *obj, const char *emission, const char *source)
|
||||||
|
{
|
||||||
|
Item *it = data;
|
||||||
|
evas_object_hide(it->base);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
|
@ -99,14 +213,8 @@ elm_pager_add(Evas_Object *parent)
|
||||||
elm_widget_del_hook_set(obj, _del_hook);
|
elm_widget_del_hook_set(obj, _del_hook);
|
||||||
elm_widget_theme_hook_set(obj, _theme_hook);
|
elm_widget_theme_hook_set(obj, _theme_hook);
|
||||||
|
|
||||||
wd->base[1] = edje_object_add(e);
|
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj);
|
||||||
_elm_theme_set(wd->base[1], "pager", "base", "default");
|
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj);
|
||||||
|
|
||||||
wd->base[0] = edje_object_add(e);
|
|
||||||
_elm_theme_set(wd->base[0], "pager", "base", "default");
|
|
||||||
// FIXME: only 1 resize obj!
|
|
||||||
evas_object_event_callback_add(wd->base[0], EVAS_CALLBACK_RESIZE, _resize, obj);
|
|
||||||
elm_widget_resize_object_set(obj, wd->base[0]);
|
|
||||||
|
|
||||||
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
|
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
|
||||||
|
|
||||||
|
@ -118,31 +226,64 @@ EAPI void
|
||||||
elm_pager_content_push(Evas_Object *obj, Evas_Object *content)
|
elm_pager_content_push(Evas_Object *obj, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
wd->stack = eina_list_append(wd->stack, content);
|
Item *it = calloc(1, sizeof(Item));
|
||||||
// FIXME: adjust min size, show new page
|
Evas_Coord x, y, w, h;
|
||||||
|
if (!it) return;
|
||||||
|
printf("#####------ push %p\n", content);
|
||||||
|
it->obj = obj;
|
||||||
|
it->content = content;
|
||||||
|
it->base = edje_object_add(evas_object_evas_get(obj));
|
||||||
|
evas_object_smart_member_add(it->base, obj);
|
||||||
|
evas_object_geometry_get(obj, &x, &y, &w, &h);
|
||||||
|
evas_object_move(it->base, x, y);
|
||||||
|
evas_object_resize(it->base, w, h);
|
||||||
|
elm_widget_sub_object_add(obj, it->base);
|
||||||
|
elm_widget_sub_object_add(obj, content);
|
||||||
|
_elm_theme_set(it->base, "pager", "base", "default");
|
||||||
|
edje_object_signal_callback_add(it->base, "elm,action,show,finished", "", _signal_show_finished, it);
|
||||||
|
edje_object_signal_callback_add(it->base, "elm,action,hide,finished", "", _signal_hide_finished, it);
|
||||||
|
edje_object_part_swallow(it->base, "elm.swallow.content", content);
|
||||||
|
evas_object_show(content);
|
||||||
|
edje_object_size_min_calc(it->base, &it->minw, &it->minh);
|
||||||
|
// FIXME: if child changes size hints...
|
||||||
|
wd->stack = eina_list_append(wd->stack, it);
|
||||||
|
_eval_top(obj);
|
||||||
|
_sizing_eval(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
elm_pager_content_pop(Evas_Object *obj)
|
elm_pager_content_pop(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
// FIXME actuall make pop animated - promote 2nd last in stack then
|
// FIXME: actually make pop animated - promote 2nd last in stack then
|
||||||
// when anim finished delete 2nd last (which was top).
|
// when anim finished delete 2nd last (which was top).
|
||||||
Evas_Object *top = elm_pager_content_top_get(obj);
|
Evas_Object *top = elm_pager_content_top_get(obj);
|
||||||
if (wd->top) evas_object_del(wd->top);
|
// if (wd->top) evas_object_del(wd->top);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
elm_pager_content_promote(Evas_Object *obj, Evas_Object *content)
|
elm_pager_content_promote(Evas_Object *obj, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
// FIXME: add to end of stack list and animate
|
Eina_List *l;
|
||||||
|
Item *it;
|
||||||
|
EINA_LIST_FOREACH(wd->stack, l, it)
|
||||||
|
{
|
||||||
|
if (it->content == content)
|
||||||
|
{
|
||||||
|
wd->stack = eina_list_remove_list(wd->stack, l);
|
||||||
|
wd->stack = eina_list_append(wd->stack, it);
|
||||||
|
_eval_top(obj);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
elm_pager_content_bottom_get(Evas_Object *obj)
|
elm_pager_content_bottom_get(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
|
// FIXME: wrong
|
||||||
if (wd->stack) return wd->stack->data;
|
if (wd->stack) return wd->stack->data;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -151,6 +292,7 @@ EAPI Evas_Object *
|
||||||
elm_pager_content_top_get(Evas_Object *obj)
|
elm_pager_content_top_get(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
|
// FIXME: wrong
|
||||||
if (wd->stack) return eina_list_last(wd->stack)->data;
|
if (wd->stack) return eina_list_last(wd->stack)->data;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue