forked from enlightenment/efl
parent
431e73c323
commit
d1227d4099
Binary file not shown.
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 1.0 KiB |
|
@ -549,8 +549,8 @@ collections {
|
|||
image {
|
||||
normal: "bt_glow.png";
|
||||
border: 12 12 12 12;
|
||||
middle: 0;
|
||||
}
|
||||
fill.smooth : 0;
|
||||
}
|
||||
description { state: "clicked" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
|
@ -773,8 +773,8 @@ collections {
|
|||
image {
|
||||
normal: "bt_glow.png";
|
||||
border: 12 12 12 12;
|
||||
middle: 0;
|
||||
}
|
||||
fill.smooth : 0;
|
||||
}
|
||||
description { state: "clicked" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
|
@ -7848,7 +7848,7 @@ collections {
|
|||
}
|
||||
part { name: "base";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
description { state: "default" 0.0;
|
||||
image {
|
||||
normal: "frame_2.png";
|
||||
border: 5 5 32 26;
|
||||
|
@ -7856,6 +7856,16 @@ collections {
|
|||
}
|
||||
fill.smooth : 0;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1.relative: -1.0 0.0;
|
||||
rel2.relative: 0.0 1.0;
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel2.relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content";
|
||||
type: SWALLOW;
|
||||
|
@ -7890,5 +7900,39 @@ collections {
|
|||
}
|
||||
}
|
||||
}
|
||||
programs {
|
||||
program { name: "show_start";
|
||||
signal: "elm,action,show";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "base";
|
||||
after: "show_start2";
|
||||
}
|
||||
program { name: "show_start2";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "base";
|
||||
after: "show_end";
|
||||
}
|
||||
program { name: "show_end";
|
||||
action: SIGNAL_EMIT "elm,action,show,finished" "";
|
||||
}
|
||||
program { name: "hide_start";
|
||||
signal: "elm,action,hide";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "base";
|
||||
after: "hide_start2";
|
||||
}
|
||||
program { name: "hide_start2";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "base";
|
||||
after: "hide_end";
|
||||
}
|
||||
program { name: "hide_end";
|
||||
action: SIGNAL_EMIT "elm,action,hide,finished" "";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2262,7 +2262,6 @@ my_bt_30(void *data, Evas_Object *obj, void *event_info)
|
|||
(void *)1007/* func data */);
|
||||
|
||||
elm_box_pack_end(bx, gl);
|
||||
evas_object_show(bx2);
|
||||
|
||||
bx2 = elm_box_add(win);
|
||||
elm_box_horizontal_set(bx2, 1);
|
||||
|
@ -2286,14 +2285,6 @@ my_bt_30(void *data, Evas_Object *obj, void *event_info)
|
|||
elm_box_pack_end(bx2, bt);
|
||||
evas_object_show(bt);
|
||||
|
||||
bt = elm_button_add(win);
|
||||
elm_button_label_set(bt, "X");
|
||||
evas_object_smart_callback_add(bt, "clicked", my_gl_clear, gl);
|
||||
evas_object_size_hint_align_set(bt, -1.0, -1.0);
|
||||
evas_object_size_hint_weight_set(bt, 1.0, 0.0);
|
||||
elm_box_pack_end(bx2, bt);
|
||||
evas_object_show(bt);
|
||||
|
||||
bt = elm_button_add(win);
|
||||
elm_button_label_set(bt, "#");
|
||||
evas_object_smart_callback_add(bt, "clicked", my_gl_disable, gl);
|
||||
|
@ -2310,6 +2301,23 @@ my_bt_30(void *data, Evas_Object *obj, void *event_info)
|
|||
elm_box_pack_end(bx2, bt);
|
||||
evas_object_show(bt);
|
||||
|
||||
elm_box_pack_end(bx, bx2);
|
||||
evas_object_show(bx2);
|
||||
|
||||
bx2 = elm_box_add(win);
|
||||
elm_box_horizontal_set(bx2, 1);
|
||||
elm_box_homogenous_set(bx2, 1);
|
||||
evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
|
||||
evas_object_size_hint_align_set(bx2, -1.0, -1.0);
|
||||
|
||||
bt = elm_button_add(win);
|
||||
elm_button_label_set(bt, "X");
|
||||
evas_object_smart_callback_add(bt, "clicked", my_gl_clear, gl);
|
||||
evas_object_size_hint_align_set(bt, -1.0, -1.0);
|
||||
evas_object_size_hint_weight_set(bt, 1.0, 0.0);
|
||||
elm_box_pack_end(bx2, bt);
|
||||
evas_object_show(bt);
|
||||
|
||||
bt = elm_button_add(win);
|
||||
elm_button_label_set(bt, "+");
|
||||
evas_object_smart_callback_add(bt, "clicked", my_gl_add, gl);
|
||||
|
@ -2758,6 +2766,35 @@ my_bt_34(void *data, Evas_Object *obj, void *event_info)
|
|||
evas_object_show(win);
|
||||
}
|
||||
|
||||
static void
|
||||
my_bt_35(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Evas_Object *win, *bg, *pg, *bx, *bt;
|
||||
char buf[PATH_MAX];
|
||||
|
||||
win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
|
||||
elm_win_title_set(win, "Pager");
|
||||
elm_win_autodel_set(win, 1);
|
||||
|
||||
bg = elm_bg_add(win);
|
||||
elm_win_resize_object_add(win, bg);
|
||||
evas_object_size_hint_weight_set(bg, 1.0, 1.0);
|
||||
evas_object_show(bg);
|
||||
|
||||
pg = elm_pager_add(win);
|
||||
elm_win_resize_object_add(win, pg);
|
||||
evas_object_show(pg);
|
||||
|
||||
bx = elm_box_add(win);
|
||||
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
||||
evas_object_show(bx);
|
||||
|
||||
|
||||
|
||||
evas_object_resize(win, 320, 320);
|
||||
evas_object_show(win);
|
||||
}
|
||||
|
||||
static void
|
||||
my_win_main(void)
|
||||
{
|
||||
|
@ -2867,6 +2904,7 @@ my_win_main(void)
|
|||
elm_list_item_append(li, "Genlist 4", NULL, NULL, my_bt_32, NULL);
|
||||
elm_list_item_append(li, "Checks", NULL, NULL, my_bt_33, NULL);
|
||||
elm_list_item_append(li, "Radios", NULL, NULL, my_bt_34, NULL);
|
||||
elm_list_item_append(li, "Pager", NULL, NULL, my_bt_35, NULL);
|
||||
|
||||
elm_list_go(li);
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ typedef struct _Widget_Data Widget_Data;
|
|||
struct _Widget_Data
|
||||
{
|
||||
Evas_Object *base[2];
|
||||
int swap;
|
||||
Eina_List *stack;
|
||||
Evas_Object *top, *oldtop;
|
||||
};
|
||||
|
@ -71,10 +72,19 @@ _eval_top(Evas_Object *obj)
|
|||
wd->oldtop = wd->top;
|
||||
wd->top = stacktop;
|
||||
// FIXME: transition from oldtop to top
|
||||
edje_object_part_swallow(wd->base[1], "elm.swallow.content", wd->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");
|
||||
edje_object_signal_emit(wd->base[1 - wd->swap], "elm,action,show", "elm");
|
||||
wd->swap = 1 - wd->swap;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(data);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_pager_add(Evas_Object *parent)
|
||||
{
|
||||
|
@ -91,11 +101,11 @@ elm_pager_add(Evas_Object *parent)
|
|||
|
||||
wd->base[1] = edje_object_add(e);
|
||||
_elm_theme_set(wd->base[1], "pager", "base", "default");
|
||||
elm_widget_resize_object_set(obj, wd->base[1]);
|
||||
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue