forked from enlightenment/efl
Add the ELM_TOOLBAR_SHRINK_EXPAND mode. The items be expanded according the size of the toolbar when it's set.
SVN revision: 68653
This commit is contained in:
parent
15dd3774cb
commit
d6a8be7f95
|
@ -57,6 +57,7 @@ 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_toolbar8(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);
|
||||
|
@ -402,6 +403,7 @@ add_tests:
|
|||
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, "Toolbars", "Toolbar 8", test_toolbar8);
|
||||
|
||||
//------------------------------//
|
||||
ADD_TEST(NULL, "Lists", "List", test_list);
|
||||
|
|
|
@ -836,4 +836,113 @@ test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
evas_object_resize(win, 320, 300);
|
||||
evas_object_show(win);
|
||||
}
|
||||
|
||||
void
|
||||
test_toolbar8(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 *item;
|
||||
Elm_Object_Item *menu_it;
|
||||
char buf[PATH_MAX];
|
||||
|
||||
win = elm_win_add(NULL, "toolbar8", ELM_WIN_BASIC);
|
||||
elm_win_title_set(win, "Toolbar 8");
|
||||
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_toolbar_homogeneous_set(tb, EINA_TRUE);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_EXPAND);
|
||||
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_object_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, -200);
|
||||
|
||||
item = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4);
|
||||
elm_toolbar_item_priority_set(item, 0);
|
||||
|
||||
item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL);
|
||||
elm_toolbar_item_menu_set(item, EINA_TRUE);
|
||||
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_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", "Scroll", tb_5, ph4);
|
||||
|
||||
elm_box_pack_end(bx, tb);
|
||||
evas_object_show(tb);
|
||||
|
||||
tb = elm_table_add(win);
|
||||
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, 420, 250);
|
||||
evas_object_show(win);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -305,6 +305,7 @@ _mirrored_set_item(Evas_Object *obj __UNUSED__, Elm_Toolbar_Item *it, Eina_Bool
|
|||
static void
|
||||
_theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_size)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *view = VIEW(it);
|
||||
Evas_Coord mw, mh;
|
||||
const char *style = elm_widget_style_get(obj);
|
||||
|
@ -336,7 +337,19 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
|
|||
edje_object_part_text_set(view, "elm.text", it->label);
|
||||
}
|
||||
else
|
||||
{
|
||||
_elm_theme_object_set(obj, view, "toolbar", "separator", style);
|
||||
if (wd->vertical)
|
||||
{
|
||||
evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, -1.0);
|
||||
evas_object_size_hint_align_set(view, EVAS_HINT_FILL, 0.5);
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_size_hint_weight_set(view, -1.0, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(view, 0.5, EVAS_HINT_FILL);
|
||||
}
|
||||
}
|
||||
|
||||
mw = mh = -1;
|
||||
if (!it->separator)
|
||||
|
@ -423,7 +436,6 @@ _sizing_eval(Evas_Object *obj)
|
|||
evas_object_size_hint_min_get(wd->bx, &minw_bx, &minh_bx);
|
||||
// if (wd->vertical && (h > minh)) minh = h;
|
||||
// if ((!wd->vertical) && (w > minw)) minw = w;
|
||||
evas_object_resize(wd->bx, minw_bx, minh_bx);
|
||||
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
|
||||
if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE)
|
||||
{
|
||||
|
@ -438,6 +450,13 @@ _sizing_eval(Evas_Object *obj)
|
|||
minh = minh_bx + (h - vh);
|
||||
}
|
||||
}
|
||||
else if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
|
||||
{
|
||||
minw = minw_bx + (w - vw);
|
||||
minh = minh_bx + (h - vh);
|
||||
if (minw_bx < vw) minw_bx = vw;
|
||||
if (minh_bx < vh) minh_bx = vh;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (wd->vertical)
|
||||
|
@ -454,6 +473,7 @@ _sizing_eval(Evas_Object *obj)
|
|||
// else minw = w - vw;
|
||||
// minh = minh + (h - vh);
|
||||
}
|
||||
evas_object_resize(wd->bx, minw_bx, minh_bx);
|
||||
evas_object_size_hint_min_set(obj, minw, minh);
|
||||
evas_object_size_hint_max_set(obj, -1, -1);
|
||||
}
|
||||
|
@ -657,6 +677,15 @@ _resize_job(void *data)
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
|
||||
{
|
||||
if ((vw >= mw) && (vh >= mh))
|
||||
evas_object_resize(wd->bx, vw, vh);
|
||||
else if (vw < mw)
|
||||
evas_object_resize(wd->bx, mw, vh);
|
||||
else if (vh < mh)
|
||||
evas_object_resize(wd->bx, vw, mh);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (wd->vertical)
|
||||
|
@ -912,6 +941,8 @@ _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);
|
||||
if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
|
||||
{
|
||||
if (wd->vertical)
|
||||
{
|
||||
evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, -1.0);
|
||||
|
@ -922,6 +953,12 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f
|
|||
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);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
}
|
||||
evas_object_size_hint_min_set(VIEW(it), mw, mh);
|
||||
evas_object_size_hint_max_set(VIEW(it), -1, -1);
|
||||
evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_RESIZE,
|
||||
|
@ -941,6 +978,8 @@ _elm_toolbar_item_label_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);
|
||||
if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
|
||||
{
|
||||
if (wd->vertical)
|
||||
{
|
||||
evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0);
|
||||
|
@ -951,6 +990,12 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
|
|||
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), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
}
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, mh);
|
||||
}
|
||||
|
||||
|
@ -1001,6 +1046,8 @@ _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);
|
||||
if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
|
||||
{
|
||||
if (wd->vertical)
|
||||
{
|
||||
evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0);
|
||||
|
@ -1011,6 +1058,12 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
|
|||
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), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
}
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, mh);
|
||||
|
||||
EINA_LIST_FOREACH(item->states, l, it_state)
|
||||
|
|
|
@ -67,6 +67,7 @@ typedef enum
|
|||
ELM_TOOLBAR_SHRINK_HIDE, /**< Hide exceeding items. */
|
||||
ELM_TOOLBAR_SHRINK_SCROLL, /**< Allow accessing exceeding items through a scroller. */
|
||||
ELM_TOOLBAR_SHRINK_MENU, /**< Inserts a button to pop up a menu with exceeding items. */
|
||||
ELM_TOOLBAR_SHRINK_EXPAND, /**< Expand all items according the size of the toolbar. */
|
||||
ELM_TOOLBAR_SHRINK_LAST /**< Indicates error if returned by elm_toolbar_shrink_mode_get() */
|
||||
} Elm_Toolbar_Shrink_Mode;
|
||||
|
||||
|
|
Loading…
Reference in New Issue