forked from enlightenment/efl
test and fix up horizontal_item style for toolbar.
SVN revision: 68313
This commit is contained in:
parent
e04656c5bf
commit
d83ff51f71
|
@ -567,27 +567,85 @@ group { name: "elm/toolbar/item/default";
|
|||
}
|
||||
|
||||
group { name: "elm/toolbar/item/item_horizontal";
|
||||
inherit: "elm/toolbar/item/default";
|
||||
parts.part { name: "elm.swallow.icon";
|
||||
description { state: "default" 0.0;
|
||||
align: 0.0 0.5;
|
||||
rel1.offset: 3 3;
|
||||
rel1.relative: 0 0;
|
||||
rel2.offset: -4 -4;
|
||||
rel2.relative: 1 1;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
parts.part { name: "elm.text";
|
||||
description { state: "default" 0.0;
|
||||
align: 1 0.5;
|
||||
min: 0 1;
|
||||
rel1.offset: 1 0;
|
||||
rel1.relative: 1 0.5;
|
||||
rel1.to_x: "elm.swallow.icon";
|
||||
text.align: 0 0.5;
|
||||
}
|
||||
}
|
||||
inherit: "elm/toolbar/item/default";
|
||||
parts {
|
||||
part { name: "elm.swallow.icon";
|
||||
description { state: "default" 0.0;
|
||||
aspect: 1 1;
|
||||
aspect_preference: VERTICAL;
|
||||
align: 0.0 0.5;
|
||||
rel1.offset: 3 3;
|
||||
rel1.relative: 0 0;
|
||||
rel2.offset: 3 -4;
|
||||
rel2.relative: 0 1;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.text";
|
||||
description { state: "default" 0.0;
|
||||
align: 1 0.5;
|
||||
min: 0 1;
|
||||
rel1.offset: 1 0;
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.to_x: "elm.swallow.icon";
|
||||
rel2.relative: 1.0 1.0;
|
||||
text.align: 0 0.5;
|
||||
}
|
||||
description { state: "selected" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
text.min: 1 1;
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
color: 0 0 0 128;
|
||||
color3: 0 0 0 0;
|
||||
}
|
||||
description { state: "disabled_visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
color: 0 0 0 128;
|
||||
color3: 0 0 0 0;
|
||||
visible: 1;
|
||||
text.min: 1 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.text_new";
|
||||
description { state: "default" 0.0;
|
||||
align: 1 0.5;
|
||||
min: 0 1;
|
||||
rel1.offset: 1 0;
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.to_x: "elm.swallow.icon";
|
||||
rel2.relative: 1.0 1.0;
|
||||
text.align: 0 0.5;
|
||||
}
|
||||
description { state: "selected" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
text.min: 1 1;
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
color: 0 0 0 128;
|
||||
color3: 0 0 0 0;
|
||||
}
|
||||
description { state: "disabled_visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
color: 0 0 0 128;
|
||||
color3: 0 0 0 0;
|
||||
visible: 1;
|
||||
text.min: 1 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
group { name: "elm/toolbar/separator/default";
|
||||
|
|
|
@ -54,6 +54,7 @@ void test_toolbar3(void *data, Evas_Object *obj, void *event_info);
|
|||
void test_toolbar4(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_toolbar5(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_toolbar6(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_toolbar7(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_hoversel(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_list(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_list_horizontal(void *data, Evas_Object *obj, void *event_info);
|
||||
|
@ -397,6 +398,7 @@ add_tests:
|
|||
ADD_TEST(NULL, "Toolbars", "Toolbar 4", test_toolbar4);
|
||||
ADD_TEST(NULL, "Toolbars", "Toolbar 5", test_toolbar5);
|
||||
ADD_TEST(NULL, "Toolbars", "Toolbar 6", test_toolbar6);
|
||||
ADD_TEST(NULL, "Toolbars", "Toolbar 7", test_toolbar7);
|
||||
|
||||
//------------------------------//
|
||||
ADD_TEST(NULL, "Lists", "List", test_list);
|
||||
|
|
|
@ -725,4 +725,115 @@ test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
evas_object_resize(win, 320, 300);
|
||||
evas_object_show(win);
|
||||
}
|
||||
|
||||
void
|
||||
test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
|
||||
Evas_Object *ph1, *ph2, *ph3, *ph4;
|
||||
Elm_Object_Item *tb_it;
|
||||
Elm_Object_Item *menu_it;
|
||||
char buf[PATH_MAX];
|
||||
|
||||
win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
|
||||
elm_win_title_set(win, "Toolbar");
|
||||
elm_win_autodel_set(win, EINA_TRUE);
|
||||
|
||||
bg = elm_bg_add(win);
|
||||
elm_win_resize_object_add(win, bg);
|
||||
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(bg);
|
||||
|
||||
bx = elm_box_add(win);
|
||||
elm_win_resize_object_add(win, bx);
|
||||
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(bx);
|
||||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_object_style_set(tb, "item_horizontal");
|
||||
elm_toolbar_homogeneous_set(tb, 0);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
|
||||
ph1 = elm_photo_add(win);
|
||||
ph2 = elm_photo_add(win);
|
||||
ph3 = elm_photo_add(win);
|
||||
ph4 = elm_photo_add(win);
|
||||
|
||||
tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
|
||||
elm_object_item_disabled_set(tb_it, EINA_TRUE);
|
||||
elm_toolbar_item_priority_set(tb_it, 100);
|
||||
|
||||
tb_it = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
|
||||
elm_toolbar_item_priority_set(tb_it, -100);
|
||||
|
||||
tb_it = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4);
|
||||
elm_toolbar_item_priority_set(tb_it, 150);
|
||||
|
||||
tb_it = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4);
|
||||
elm_toolbar_item_priority_set(tb_it, 0);
|
||||
|
||||
tb_it = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4);
|
||||
elm_toolbar_item_priority_set(tb_it, -200);
|
||||
|
||||
tb_it = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL);
|
||||
elm_toolbar_item_menu_set(tb_it, EINA_TRUE);
|
||||
elm_toolbar_item_priority_set(tb_it, -999999);
|
||||
elm_toolbar_menu_parent_set(tb, win);
|
||||
menu = elm_toolbar_item_menu_get(tb_it);
|
||||
|
||||
elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", tb_3, ph4);
|
||||
menu_it = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", tb_4, ph4);
|
||||
elm_menu_item_add(menu, menu_it, "edit-paste", "is set to", tb_4, ph4);
|
||||
elm_menu_item_add(menu, NULL, "edit-delete", "Menu", tb_5, ph4);
|
||||
|
||||
elm_box_pack_end(bx, tb);
|
||||
evas_object_show(tb);
|
||||
|
||||
tb = elm_table_add(win);
|
||||
//elm_table_homogeneous_set(tb, 1);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
|
||||
ph = ph1;
|
||||
elm_photo_size_set(ph, 40);
|
||||
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
|
||||
elm_photo_file_set(ph, buf);
|
||||
evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(ph, 0.5, 0.5);
|
||||
elm_table_pack(tb, ph, 0, 0, 1, 1);
|
||||
evas_object_show(ph);
|
||||
|
||||
ph = ph2;
|
||||
elm_photo_size_set(ph, 80);
|
||||
evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(ph, 0.5, 0.5);
|
||||
elm_table_pack(tb, ph, 1, 0, 1, 1);
|
||||
evas_object_show(ph);
|
||||
|
||||
ph = ph3;
|
||||
elm_photo_size_set(ph, 20);
|
||||
snprintf(buf, sizeof(buf), "%s/images/sky_01.jpg", elm_app_data_dir_get());
|
||||
elm_photo_file_set(ph, buf);
|
||||
evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(ph, 0.5, 0.5);
|
||||
elm_table_pack(tb, ph, 0, 1, 1, 1);
|
||||
evas_object_show(ph);
|
||||
|
||||
ph = ph4;
|
||||
elm_photo_size_set(ph, 60);
|
||||
snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", elm_app_data_dir_get());
|
||||
elm_photo_file_set(ph, buf);
|
||||
evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(ph, 0.5, 0.5);
|
||||
elm_table_pack(tb, ph, 1, 1, 1, 1);
|
||||
evas_object_show(ph);
|
||||
|
||||
elm_box_pack_end(bx, tb);
|
||||
evas_object_show(tb);
|
||||
|
||||
evas_object_resize(win, 320, 300);
|
||||
evas_object_show(win);
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue