From: discomfitor Date: Sun, 7 Aug 2011 03:42:28 +0000 (+0000) Subject: more useless elm stuff: vertical toolbar orientation (by cedric's request) along... X-Git-Tag: REL_F_I9500_20111122_1~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f34a2f0d6fb35576d977dba63ab29457d7c25ed;p=framework%2Fuifw%2Felementary.git more useless elm stuff: vertical toolbar orientation (by cedric's request) along with toolbar test 6 as a demo. still pretty buggy but I'm tired and don't know when/if I'll get around to fixing it up. play with the toolbar weight in the test to find more bugs! git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@62171 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/bin/test.c b/src/bin/test.c index a785c20..76987c8 100644 --- a/src/bin/test.c +++ b/src/bin/test.c @@ -46,6 +46,7 @@ void test_toolbar2(void *data, Evas_Object *obj, void *event_info); 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_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); @@ -327,6 +328,7 @@ my_win_main(char *autorun, Eina_Bool test_win_only) ADD_TEST("Toolbar 3", test_toolbar3); ADD_TEST("Toolbar 4", test_toolbar4); ADD_TEST("Toolbar 5", test_toolbar5); + ADD_TEST("Toolbar 6", test_toolbar6); ADD_TEST("Hoversel", test_hoversel); ADD_TEST("List", test_list); ADD_TEST("List - Horizontal", test_list_horizontal); diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c index a1e8255..b71a40c 100644 --- a/src/bin/test_toolbar.c +++ b/src/bin/test_toolbar.c @@ -616,4 +616,116 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_resize(win, 320, 300); evas_object_show(win); } + +void +test_toolbar6(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_Toolbar_Item *item; + Elm_Menu_Item *menu_item; + 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); + elm_box_horizontal_set(bx, EINA_TRUE); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(bx); + + tb = elm_toolbar_add(win); + elm_toolbar_orientation_set(tb, EINA_TRUE); + elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU); + evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); + + ph1 = elm_photo_add(win); + ph2 = elm_photo_add(win); + ph3 = elm_photo_add(win); + ph4 = elm_photo_add(win); + + item = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1); + elm_toolbar_item_disabled_set(item, EINA_TRUE); + elm_toolbar_item_priority_set(item, 100); + + item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1); + elm_toolbar_item_priority_set(item, -100); + + item = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4); + elm_toolbar_item_priority_set(item, 150); + + item = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4); + elm_toolbar_item_priority_set(item, 0); + + item = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4); + elm_toolbar_item_priority_set(item, -200); + + item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); + elm_toolbar_item_menu_set(item, 1); + elm_toolbar_item_priority_set(item, -999999); + elm_toolbar_menu_parent_set(tb, win); + menu = elm_toolbar_item_menu_get(item); + + elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", tb_3, ph4); + menu_item = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", tb_4, ph4); + elm_menu_item_add(menu, menu_item, "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, EVAS_HINT_EXPAND, 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", PACKAGE_DATA_DIR); + 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", PACKAGE_DATA_DIR); + 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", PACKAGE_DATA_DIR); + 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 diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 408b835..782c4cf 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -403,8 +403,6 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_min_get(wd->bx, &minw, &minh); minw_bx = minw; minh_bx = minh; - if (wd->vertical && (h > minh)) minh = h; - if ((!wd->vertical) && (w > minw)) minw = w; evas_object_resize(wd->bx, minw, minh); elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE) @@ -414,8 +412,16 @@ _sizing_eval(Evas_Object *obj) } else { + case ELM_TOOLBAR_SHRINK_MENU: /* fallthrough */ + case ELM_TOOLBAR_SHRINK_HIDE: /* fallthrough */ + case ELM_TOOLBAR_SHRINK_SCROLL: if (wd->vertical) minh = h - vh; else minw = w - vw; + break; + case ELM_TOOLBAR_SHRINK_NONE: + if (wd->vertical) minh = minh_bx + (h - vh); + else minw = minw_bx + (w - vw); + break; } minh = minh + (h - vh); evas_object_size_hint_min_set(obj, minw, minh); @@ -642,7 +648,7 @@ _select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__ Elm_Toolbar_Item *it = data; if ((_elm_config->access_mode == ELM_ACCESS_MODE_OFF) || - (_elm_access_2nd_click_timeout(it->base.view))) + (_elm_access_2nd_click_timeout(VIEW(it)))) { if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) _elm_access_say(E_("Selected")); @@ -708,7 +714,7 @@ _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data) Evas_Object *obj = (Evas_Object *) data; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - _els_box_layout(o, priv, 1, wd->homogeneous, elm_widget_mirrored_get(obj)); + _els_box_layout(o, priv, !wd->vertical, wd->homogeneous, elm_widget_mirrored_get(obj)); } static char * @@ -760,7 +766,7 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f it->separator = EINA_FALSE; it->base.data = data; VIEW(it) = edje_object_add(evas_object_evas_get(obj)); - _elm_access_item_register((Elm_Widget_Item *)it, it->base.view); + _elm_access_item_register((Elm_Widget_Item *)it, VIEW(it)); _elm_access_text_set(_elm_access_item_get((Elm_Widget_Item *)it), ELM_ACCESS_TYPE, E_("Tool Item")); _elm_access_callback_set(_elm_access_item_get((Elm_Widget_Item *)it), @@ -811,8 +817,16 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh); - evas_object_size_hint_weight_set(VIEW(it), -1.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(VIEW(it), 0.5, EVAS_HINT_FILL); + if (wd->vertical) + { + evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, -1.0); + evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, 0.5); + } + else + { + evas_object_size_hint_weight_set(VIEW(it), -1.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(VIEW(it), 0.5, EVAS_HINT_FILL); + } evas_object_size_hint_min_set(VIEW(it), mw, mh); evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_RESIZE, _resize_item, obj); @@ -1270,13 +1284,22 @@ static void _elm_toolbar_item_label_update(Elm_Toolbar_Item *item) { Evas_Coord mw = -1, mh = -1; + Widget_Data *wd = elm_widget_data_get(item->base.widget); edje_object_part_text_set(VIEW(item), "elm.text", item->label); elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh); - evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL); + if (wd->vertical) + { + evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0); + evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, 0.5); + } + else + { + evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL); + } evas_object_size_hint_min_set(VIEW(item), mw, mh); } @@ -1325,6 +1348,7 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item) Elm_Toolbar_Item_State *it_state; Eina_List *l; Evas_Coord mw = -1, mh = -1; + Widget_Data *wd = elm_widget_data_get(item->base.widget); Evas_Object *old_icon = edje_object_part_swallow_get(VIEW(item), "elm.swallow.icon"); elm_widget_sub_object_del(VIEW(item), old_icon); @@ -1333,8 +1357,16 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item) elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh); - evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL); + if (wd->vertical) + { + evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL); + } + else + { + evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL); + } evas_object_size_hint_min_set(VIEW(item), mw, mh); EINA_LIST_FOREACH(item->states, l, it_state) @@ -1915,7 +1947,7 @@ elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - wd->vertical = !horizontal; + wd->vertical = vertical; _sizing_eval(obj); }