From b2d2348028b442172f211ef91f5c4091e94d66e6 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 28 Sep 2009 19:23:33 +0000 Subject: [PATCH] EVAS_HINT_EXPAND/EVAS_HINT_FILL changes in mass. (Built and tested) SVN revision: 42779 --- src/bin/test.c | 4 +- src/bin/test_bg.c | 4 +- src/bin/test_box.c | 12 ++-- src/bin/test_button.c | 4 +- src/bin/test_carousel.c | 2 +- src/bin/test_check.c | 12 ++-- src/bin/test_clock.c | 4 +- src/bin/test_entry.c | 100 +++++++++++++-------------- src/bin/test_fileselector.c | 8 +-- src/bin/test_genlist.c | 158 +++++++++++++++++++++---------------------- src/bin/test_hover.c | 8 +-- src/bin/test_hoversel.c | 4 +- src/bin/test_icon_desktops.c | 4 +- src/bin/test_index.c | 6 +- src/bin/test_inwin.c | 4 +- src/bin/test_layout.c | 4 +- src/bin/test_list.c | 30 ++++---- src/bin/test_notepad.c | 24 +++---- src/bin/test_notify.c | 29 +++----- src/bin/test_pager.c | 22 +++--- src/bin/test_photo.c | 12 ++-- src/bin/test_photocam.c | 22 +++--- src/bin/test_progressbar.c | 39 ++++++----- src/bin/test_radio.c | 12 ++-- src/bin/test_scaling.c | 8 +-- src/bin/test_scroller.c | 20 +++--- src/bin/test_separator.c | 8 +-- src/bin/test_slider.c | 22 +++--- src/bin/test_slideshow.c | 4 +- src/bin/test_spinner.c | 12 ++-- src/bin/test_table.c | 28 ++++---- src/bin/test_toggle.c | 15 ++-- src/bin/test_win_state.c | 3 +- 33 files changed, 330 insertions(+), 318 deletions(-) diff --git a/src/bin/test.c b/src/bin/test.c index 778fe65..66bd70a 100644 --- a/src/bin/test.c +++ b/src/bin/test.c @@ -98,7 +98,7 @@ my_win_main(void) * a lot more resources, so only use it if you need it. */ bg = elm_bg_add(win); /* set weight to 1.0 x 1.0 == expand in both x and y direction */ - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); /* tell the window that this object is to be resized along with the window. * also as a result this object will be one of several objects that * controls the minimum/maximum size of the window */ @@ -109,7 +109,7 @@ my_win_main(void) /* add a box layout widget to the window */ bx0 = elm_box_add(win); /* allow base box (bx0) to expand in x and y */ - evas_object_size_hint_weight_set(bx0, 1.0, 1.0); + evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); /* tell the window that the box affects window size and also will be * resized when the window is */ elm_win_resize_object_add(win, bx0); diff --git a/src/bin/test_bg.c b/src/bin/test_bg.c index 9335642..764f92b 100644 --- a/src/bin/test_bg.c +++ b/src/bin/test_bg.c @@ -11,7 +11,7 @@ test_bg_plain(void *data, Evas_Object *obj, void *event_info) bg = elm_bg_add(win); /* allow bg to expand in x & y */ - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); @@ -43,7 +43,7 @@ test_bg_image(void *data, Evas_Object *obj, void *event_info) bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); elm_bg_file_set(bg, buf, NULL); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); diff --git a/src/bin/test_box.c b/src/bin/test_box.c index 012a6be..0a19d92 100644 --- a/src/bin/test_box.c +++ b/src/bin/test_box.c @@ -12,12 +12,12 @@ test_box_vert(void *data, Evas_Object *obj, void *event_info) 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_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, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); ic = elm_icon_add(win); @@ -40,7 +40,7 @@ test_box_vert(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - evas_object_size_hint_align_set(ic, 1.0, 0.5); + evas_object_size_hint_align_set(ic, EVAS_HINT_EXPAND, 0.5); elm_box_pack_end(bx, ic); evas_object_show(ic); @@ -59,13 +59,13 @@ test_box_horiz(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); elm_box_horizontal_set(bx, 1); elm_win_resize_object_add(win, bx); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); ic = elm_icon_add(win); @@ -88,7 +88,7 @@ test_box_horiz(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - evas_object_size_hint_align_set(ic, 0.0, 1.0); + evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND); elm_box_pack_end(bx, ic); evas_object_show(ic); diff --git a/src/bin/test_button.c b/src/bin/test_button.c index 6027cc2..ee5b2da 100644 --- a/src/bin/test_button.c +++ b/src/bin/test_button.c @@ -12,11 +12,11 @@ test_button(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); diff --git a/src/bin/test_carousel.c b/src/bin/test_carousel.c index d238800..b95278e 100644 --- a/src/bin/test_carousel.c +++ b/src/bin/test_carousel.c @@ -12,7 +12,7 @@ test_carousel(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); evas_object_resize(win, 320, 240); diff --git a/src/bin/test_check.c b/src/bin/test_check.c index 63fc163..f553661 100644 --- a/src/bin/test_check.c +++ b/src/bin/test_check.c @@ -12,11 +12,11 @@ test_check(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -25,8 +25,8 @@ test_check(void *data, Evas_Object *obj, void *event_info) elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); ck = elm_check_add(win); - evas_object_size_hint_weight_set(ck, 1.0, 1.0); - evas_object_size_hint_align_set(ck, -1.0, 0.5); + evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); elm_check_label_set(ck, "Icon sized to check"); elm_check_icon_set(ck, ic); elm_check_state_set(ck, 1); @@ -55,8 +55,8 @@ test_check(void *data, Evas_Object *obj, void *event_info) elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); ck = elm_check_add(win); - evas_object_size_hint_weight_set(ck, 1.0, 1.0); - evas_object_size_hint_align_set(ck, -1.0, 0.5); + evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); elm_check_label_set(ck, "Disabled check"); elm_check_icon_set(ck, ic); elm_check_state_set(ck, 1); diff --git a/src/bin/test_clock.c b/src/bin/test_clock.c index 9364bb5..89ba7b6 100644 --- a/src/bin/test_clock.c +++ b/src/bin/test_clock.c @@ -11,11 +11,11 @@ test_clock(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index eb762bb..d21ee91 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -51,11 +51,11 @@ test_entry(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -69,45 +69,45 @@ test_entry(void *data, Evas_Object *obj, void *event_info) "in here to edit it. By the way, links are
" "called Anchors so you will need
" "to refer to them this way."); - evas_object_size_hint_weight_set(en, 1.0, 1.0); - evas_object_size_hint_align_set(en, -1.0, -1.0); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, en); evas_object_show(en); bx2 = elm_box_add(win); elm_box_horizontal_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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "Clear"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_1, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Print"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Selection"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_3, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Insert"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_4, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -130,11 +130,11 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -142,15 +142,15 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_scroller_bounce_set(sc, 0, 0); - evas_object_size_hint_weight_set(sc, 1.0, 0.0); - evas_object_size_hint_align_set(sc, -1.0, -1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, sc); en = elm_entry_add(win); elm_entry_single_line_set(en, 1); elm_entry_entry_set(en, "Disabled entry"); - evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.5); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_disabled_set(en, 1); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -161,15 +161,15 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_scroller_bounce_set(sc, 0, 0); - evas_object_size_hint_weight_set(sc, 1.0, 0.0); - evas_object_size_hint_align_set(sc, -1.0, -1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, sc); en = elm_entry_add(win); elm_entry_password_set(en, 1); elm_entry_entry_set(en, "Access denied, give up!"); - evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.5); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_disabled_set(en, 1); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -177,8 +177,8 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) evas_object_show(sc); sc = elm_scroller_add(win); - evas_object_size_hint_weight_set(sc, 1.0, 1.0); - evas_object_size_hint_align_set(sc, -1.0, -1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); elm_scroller_bounce_set(sc, 0, 1); elm_box_pack_end(bx, sc); @@ -191,8 +191,8 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) "We can use markup like this for styling and
" "formatting like this, as well as
" "links in the text, but it won't be editable or clickable."); - evas_object_size_hint_weight_set(en, 1.0, 1.0); - evas_object_size_hint_align_set(en, -1.0, -1.0); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_disabled_set(en, 1); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -208,15 +208,15 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_scroller_bounce_set(sc, 0, 0); - evas_object_size_hint_weight_set(sc, 1.0, 0.0); - evas_object_size_hint_align_set(sc, -1.0, -1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, sc); en = elm_entry_add(win); elm_entry_single_line_set(en, 1); elm_entry_entry_set(en, "This is a single line"); - evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.5); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_select_all(en); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -227,23 +227,23 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_scroller_bounce_set(sc, 0, 0); - evas_object_size_hint_weight_set(sc, 1.0, 0.0); - evas_object_size_hint_align_set(sc, -1.0, -1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, sc); en = elm_entry_add(win); elm_entry_password_set(en, 1); elm_entry_entry_set(en, "Password here"); - evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.0); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.0); elm_scroller_content_set(sc, en); evas_object_show(en); evas_object_show(sc); sc = elm_scroller_add(win); - evas_object_size_hint_weight_set(sc, 1.0, 1.0); - evas_object_size_hint_align_set(sc, -1.0, -1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); elm_scroller_bounce_set(sc, 0, 1); elm_box_pack_end(bx, sc); @@ -258,8 +258,8 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) "called Anchors so you will need
" "to refer to them this way. At the end here is a really long line to test line wrapping to see if it works. But just in case this line is not long enough I will add more here to really test it out, as Elementary really needs some good testing to see if entry widgets work as advertised."); evas_object_smart_callback_add(en, "anchor,clicked", anchor_test, en); - evas_object_size_hint_weight_set(en, 1.0, 1.0); - evas_object_size_hint_align_set(en, -1.0, -1.0); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -267,38 +267,38 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) bx2 = elm_box_add(win); elm_box_horizontal_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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "Clear"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_1, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Print"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Selection"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_3, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Insert"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_4, en); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c index 4b37b84..f5e7e68 100644 --- a/src/bin/test_fileselector.c +++ b/src/bin/test_fileselector.c @@ -60,12 +60,12 @@ test_fileselector(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); vbox = elm_box_add(win); elm_win_resize_object_add(win, vbox); - evas_object_size_hint_weight_set(vbox, 1.0, 1.0); + evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(vbox); fs = elm_fileselector_add(win); @@ -76,8 +76,8 @@ test_fileselector(void *data, Evas_Object *obj, void *event_info) /* start the fileselector in the home dir */ elm_fileselector_path_set(fs, getenv("HOME")); /* allow fs to expand in x & y */ - evas_object_size_hint_weight_set(fs, 1.0, 1.0); - evas_object_size_hint_align_set(fs, -1.0, -1.0); + evas_object_size_hint_weight_set(fs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(fs, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(vbox, fs); evas_object_show(fs); // TODO fix this is the widget diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index c9c30d1..eed9933 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -67,13 +67,13 @@ test_genlist(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); gl = elm_genlist_add(win); elm_genlist_horizontal_mode_set(gl, ELM_LIST_LIMIT); elm_win_resize_object_add(win, gl); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); over = evas_object_rectangle_add(evas_object_evas_get(win)); @@ -81,7 +81,7 @@ test_genlist(void *data, Evas_Object *obj, void *event_info) evas_object_event_callback_add(over, EVAS_CALLBACK_MOUSE_MOVE, _move, gl); evas_object_repeat_events_set(over, 1); evas_object_show(over); - evas_object_size_hint_weight_set(over, 1.0, 1.0); + evas_object_size_hint_weight_set(over, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, over); itc1.item_style = "default"; @@ -273,17 +273,17 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); elm_bg_file_set(bg, buf, NULL); elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); gl = elm_genlist_add(win); - evas_object_size_hint_align_set(gl, -1.0, -1.0); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); itc1.item_style = "default"; @@ -319,38 +319,38 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "/\\"); evas_object_smart_callback_add(bt, "clicked", my_gl_first, gl); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 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_last, gl); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 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); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "U"); evas_object_smart_callback_add(bt, "clicked", my_gl_update_all, gl); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -360,30 +360,30 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); 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); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 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); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 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_del, gl); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -393,22 +393,22 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info) bx3 = elm_box_add(win); elm_box_horizontal_set(bx3, 1); elm_box_homogenous_set(bx3, 1); - evas_object_size_hint_weight_set(bx3, 1.0, 0.0); - evas_object_size_hint_align_set(bx3, -1.0, -1.0); + evas_object_size_hint_weight_set(bx3, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx3, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "+ before"); evas_object_smart_callback_add(bt, "clicked", my_gl_insert_before, gl); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx3, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "+ after"); evas_object_smart_callback_add(bt, "clicked", my_gl_insert_after, gl); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx3, bt); evas_object_show(bt); @@ -491,17 +491,17 @@ test_genlist3(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); gl = elm_genlist_add(win); - evas_object_size_hint_align_set(gl, -1.0, -1.0); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); itc2.item_style = "default"; @@ -529,30 +529,30 @@ test_genlist3(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "[1]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[2]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[3]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -637,18 +637,18 @@ test_genlist4(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); gl = elm_genlist_add(win); elm_genlist_multi_select_set(gl, 1); - evas_object_size_hint_align_set(gl, -1.0, -1.0); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); itc3.item_style = "default"; @@ -676,30 +676,30 @@ test_genlist4(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "[1]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[2]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[3]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -827,18 +827,18 @@ test_genlist5(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); gl = elm_genlist_add(win); elm_genlist_always_select_mode_set(gl, 1); - evas_object_size_hint_align_set(gl, -1.0, -1.0); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); itc5.item_style = "double_label"; itc5.func.label_get = gl5_label_get; @@ -873,30 +873,30 @@ test_genlist5(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "[1]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[2]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[3]"); evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -998,17 +998,17 @@ test_genlist6(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); gl = elm_genlist_add(win); - evas_object_size_hint_align_set(gl, -1.0, -1.0); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); itc4.item_style = "default"; @@ -1038,30 +1038,30 @@ test_genlist6(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "[1]"); // evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[2]"); // evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "[3]"); // evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2])); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); diff --git a/src/bin/test_hover.c b/src/bin/test_hover.c index 9091255..51e97f3 100644 --- a/src/bin/test_hover.c +++ b/src/bin/test_hover.c @@ -20,11 +20,11 @@ test_hover(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -101,11 +101,11 @@ test_hover2(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c index fe14764..cf8f3da 100644 --- a/src/bin/test_hoversel.c +++ b/src/bin/test_hoversel.c @@ -12,12 +12,12 @@ test_hoversel(void *data, Evas_Object *obj, void *event_info) 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_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, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); bt = elm_hoversel_add(win); diff --git a/src/bin/test_icon_desktops.c b/src/bin/test_icon_desktops.c index e4bdfcd..313ce50 100644 --- a/src/bin/test_icon_desktops.c +++ b/src/bin/test_icon_desktops.c @@ -74,7 +74,7 @@ test_icon_desktops(void *data, Evas_Object *obj, void *event_info) elm_win_autodel_set(win, 1); bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); @@ -85,7 +85,7 @@ test_icon_desktops(void *data, Evas_Object *obj, void *event_info) it_desk.func.del = desk_gl_del; gl = elm_genlist_add(win); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, gl); evas_object_show(gl); diff --git a/src/bin/test_index.c b/src/bin/test_index.c index 2adb23c..955f0b7 100644 --- a/src/bin/test_index.c +++ b/src/bin/test_index.c @@ -47,16 +47,16 @@ test_index(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); gl = elm_genlist_add(win); - evas_object_size_hint_weight_set(gl, 1.0, 1.0); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, gl); evas_object_show(gl); id = elm_index_add(win); - evas_object_size_hint_weight_set(id, 1.0, 1.0); + evas_object_size_hint_weight_set(id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, id); evas_object_show(id); diff --git a/src/bin/test_inwin.c b/src/bin/test_inwin.c index 62035e3..d1adf02 100644 --- a/src/bin/test_inwin.c +++ b/src/bin/test_inwin.c @@ -12,7 +12,7 @@ test_inwin(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); inwin = elm_win_inwin_add(win); @@ -44,7 +44,7 @@ test_inwin2(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); inwin = elm_win_inwin_add(win); diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c index 81fafa9..728ed24 100644 --- a/src/bin/test_layout.c +++ b/src/bin/test_layout.c @@ -12,13 +12,13 @@ test_layout(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); ly = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); elm_layout_file_set(ly, buf, "layout"); - evas_object_size_hint_weight_set(ly, 1.0, 1.0); + evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, ly); evas_object_show(ly); diff --git a/src/bin/test_list.c b/src/bin/test_list.c index 9fa1d77..7074301 100644 --- a/src/bin/test_list.c +++ b/src/bin/test_list.c @@ -12,12 +12,12 @@ test_list(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); li = elm_list_add(win); elm_win_resize_object_add(win, li); - evas_object_size_hint_weight_set(li, 1.0, 1.0); + evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); @@ -65,7 +65,7 @@ test_list(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - evas_object_size_hint_align_set(ic, 0.0, 1.0); + evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND); elm_box_pack_end(bx, ic); evas_object_show(ic); elm_list_item_append(li, "are", bx, NULL, NULL, NULL); @@ -123,17 +123,17 @@ test_list2(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); elm_bg_file_set(bg, buf, NULL); elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); li = elm_list_add(win); - evas_object_size_hint_align_set(li, -1.0, -1.0); - evas_object_size_hint_weight_set(li, 1.0, 1.0); + evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_list_horizontal_mode_set(li, ELM_LIST_LIMIT); // elm_list_multi_select_set(li, 1); @@ -201,14 +201,14 @@ test_list2(void *data, Evas_Object *obj, void *event_info) 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); elm_button_label_set(bt, "Clear"); evas_object_smart_callback_add(bt, "clicked", my_li2_clear, li); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -233,12 +233,12 @@ test_list3(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); li = elm_list_add(win); elm_win_resize_object_add(win, li); - evas_object_size_hint_weight_set(li, 1.0, 1.0); + evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_list_horizontal_mode_set(li, ELM_LIST_COMPRESS); ic = elm_icon_add(win); @@ -286,11 +286,11 @@ test_list3(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - evas_object_size_hint_align_set(ic, 0.0, 1.0); + evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND); elm_box_pack_end(bx, ic); evas_object_show(ic); - elm_list_item_append(li, "are", bx, NULL, NULL, NULL); + elm_list_item_append(li, "are", bx, NULL, NULL, NULL); elm_list_item_append(li, "you", NULL, NULL, NULL, NULL); elm_list_item_append(li, "doing", NULL, NULL, NULL, NULL); elm_list_item_append(li, "out", NULL, NULL, NULL, NULL); diff --git a/src/bin/test_notepad.c b/src/bin/test_notepad.c index 3ee8a6b..50b018e 100644 --- a/src/bin/test_notepad.c +++ b/src/bin/test_notepad.c @@ -30,26 +30,26 @@ test_notepad(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); np = elm_notepad_add(win); elm_notepad_file_set(np, "note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8); - evas_object_size_hint_weight_set(np, 1.0, 1.0); - evas_object_size_hint_align_set(np, -1.0, -1.0); + evas_object_size_hint_weight_set(np, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(np, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, np); evas_object_show(np); 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); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); ic = elm_icon_add(win); @@ -58,8 +58,8 @@ test_notepad(void *data, Evas_Object *obj, void *event_info) elm_button_icon_set(bt, ic); evas_object_show(ic); evas_object_smart_callback_add(bt, "clicked", my_notepad_bt_1, np); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -70,8 +70,8 @@ test_notepad(void *data, Evas_Object *obj, void *event_info) elm_button_icon_set(bt, ic); evas_object_show(ic); evas_object_smart_callback_add(bt, "clicked", my_notepad_bt_2, np); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); @@ -82,8 +82,8 @@ test_notepad(void *data, Evas_Object *obj, void *event_info) elm_button_icon_set(bt, ic); evas_object_show(ic); evas_object_smart_callback_add(bt, "clicked", my_notepad_bt_3, np); - evas_object_size_hint_align_set(bt, -1.0, -1.0); - evas_object_size_hint_weight_set(bt, 1.0, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); diff --git a/src/bin/test_notify.c b/src/bin/test_notify.c index 5abd2d3..2d6e4b1 100644 --- a/src/bin/test_notify.c +++ b/src/bin/test_notify.c @@ -4,7 +4,6 @@ #include #ifndef ELM_LIB_QUICKLAUNCH - static void _bt(void *data, Evas_Object *obj, void *event_info) { @@ -31,18 +30,17 @@ test_notify(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx2 = elm_box_add(win); - evas_object_size_hint_weight_set(bx2, 1.0, 1.0); + evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx2); evas_object_show(bx2); - notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx = elm_box_add(win); elm_notify_content_set(notify, bx); @@ -66,11 +64,9 @@ test_notify(void *data, Evas_Object *obj, void *event_info) elm_box_pack_end(bx2, bt); evas_object_show(bt); - - notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM); elm_notify_timeout_set(notify, 5); @@ -96,10 +92,9 @@ test_notify(void *data, Evas_Object *obj, void *event_info) elm_box_pack_end(bx2, bt); evas_object_show(bt); - notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_LEFT); elm_notify_timeout_set(notify, 10); @@ -127,7 +122,7 @@ test_notify(void *data, Evas_Object *obj, void *event_info) notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_RIGHT); bx = elm_box_add(win); @@ -152,10 +147,9 @@ test_notify(void *data, Evas_Object *obj, void *event_info) elm_box_pack_end(bx2, bt); evas_object_show(bt); - notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_TOP_LEFT); bx = elm_box_add(win); @@ -182,7 +176,7 @@ test_notify(void *data, Evas_Object *obj, void *event_info) notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_TOP_RIGHT); bx = elm_box_add(win); @@ -207,11 +201,9 @@ test_notify(void *data, Evas_Object *obj, void *event_info) elm_box_pack_end(bx2, bt); evas_object_show(bt); - - notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM_LEFT); bx = elm_box_add(win); @@ -236,10 +228,9 @@ test_notify(void *data, Evas_Object *obj, void *event_info) elm_box_pack_end(bx2, bt); evas_object_show(bt); - notify = elm_notify_add(win); elm_win_resize_object_add(win, notify); - evas_object_size_hint_weight_set(notify, 1.0, 1.0); + evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM_RIGHT); bx = elm_box_add(win); diff --git a/src/bin/test_pager.c b/src/bin/test_pager.c index 18fbb10..25d22d0 100644 --- a/src/bin/test_pager.c +++ b/src/bin/test_pager.c @@ -48,7 +48,7 @@ test_pager(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); pg = elm_pager_add(win); @@ -58,7 +58,7 @@ test_pager(void *data, Evas_Object *obj, void *event_info) info.pager = pg; bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); lb = elm_label_add(win); @@ -74,15 +74,16 @@ test_pager(void *data, Evas_Object *obj, void *event_info) "the stack).
" "
" "The theme may define the animation how
" - "show and hide of pages." - ); + "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); + bt = elm_button_add(win); elm_button_label_set(bt, "Popme"); evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info); @@ -92,8 +93,9 @@ test_pager(void *data, Evas_Object *obj, void *event_info) info.pg1 = bx; bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); + lb = elm_label_add(win); elm_label_label_set(lb, "This is page 2 in a pager stack.
" @@ -103,11 +105,13 @@ test_pager(void *data, Evas_Object *obj, void *event_info) ); 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); + bt = elm_button_add(win); elm_button_label_set(bt, "Popme"); evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info); @@ -117,22 +121,24 @@ test_pager(void *data, Evas_Object *obj, void *event_info) info.pg2 = bx; bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); + lb = elm_label_add(win); elm_label_label_set(lb, "This is page 3 in a pager stack.
" "
" "This is just like the previous page in
" - "the pager stack." - ); + "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); + bt = elm_button_add(win); elm_button_label_set(bt, "Popme"); evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info); diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c index 9d7fb97..8c82d57 100644 --- a/src/bin/test_photo.c +++ b/src/bin/test_photo.c @@ -24,12 +24,12 @@ test_photo(void *data, Evas_Object *obj, void *event_info) elm_win_autodel_set(win, 1); bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); tb = elm_table_add(win); - evas_object_size_hint_weight_set(tb, 1.0, 1.0); + evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); n = 0; for (j = 0; j < 12; j++) @@ -42,8 +42,10 @@ test_photo(void *data, Evas_Object *obj, void *event_info) n++; if (n >= 9) n = 0; elm_photo_file_set(ph, buf); - evas_object_size_hint_weight_set(ph, 1.0, 1.0); - evas_object_size_hint_align_set(ph, -1.0, -1.0); + evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(ph, EVAS_HINT_FILL, + EVAS_HINT_FILL); elm_photo_size_set(ph, 80); elm_table_pack(tb, ph, i, j, 1, 1); evas_object_show(ph); @@ -51,7 +53,7 @@ test_photo(void *data, Evas_Object *obj, void *event_info) } sc = elm_scroller_add(win); - evas_object_size_hint_weight_set(sc, 1.0, 1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, sc); elm_scroller_content_set(sc, tb); diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c index 190e8a1..e517d2b 100644 --- a/src/bin/test_photocam.c +++ b/src/bin/test_photocam.c @@ -105,12 +105,12 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) elm_win_autodel_set(win, 1); bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); ph = elm_photocam_add(win); - evas_object_size_hint_weight_set(ph, 1.0, 1.0); + evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, ph); evas_object_data_set(ph, "window", win); @@ -119,13 +119,13 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) evas_object_show(ph); tb2 = elm_table_add(win); - evas_object_size_hint_weight_set(tb2, 1.0, 1.0); + evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, tb2); bt = elm_button_add(win); elm_button_label_set(bt, "Z -"); evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_out, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.1, 0.1); elm_table_pack(tb2, bt, 0, 0, 1, 1); evas_object_show(bt); @@ -133,7 +133,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Select Photo"); evas_object_smart_callback_add(bt, "clicked", my_bt_open, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.5, 0.1); elm_table_pack(tb2, bt, 1, 0, 1, 1); evas_object_show(bt); @@ -141,7 +141,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Z +"); evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_in, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.9, 0.1); elm_table_pack(tb2, bt, 2, 0, 1, 1); evas_object_show(bt); @@ -150,7 +150,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Show 30,50 500x300"); evas_object_smart_callback_add(bt, "clicked", my_bt_show_reg, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.1, 0.5); elm_table_pack(tb2, bt, 0, 1, 1, 1); evas_object_show(bt); @@ -158,7 +158,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Bring 800,300 500x300"); evas_object_smart_callback_add(bt, "clicked", my_bt_bring_reg, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.9, 0.5); elm_table_pack(tb2, bt, 2, 1, 1, 1); evas_object_show(bt); @@ -167,7 +167,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Manual"); evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_man, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.1, 0.9); elm_table_pack(tb2, bt, 0, 2, 1, 1); evas_object_show(bt); @@ -175,7 +175,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Fit"); evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fit, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.5, 0.9); elm_table_pack(tb2, bt, 1, 2, 1, 1); evas_object_show(bt); @@ -183,7 +183,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "Fill"); evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fill, ph); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.9, 0.9); elm_table_pack(tb2, bt, 2, 2, 1, 1); evas_object_show(bt); diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c index fa581be..e7dad9d 100644 --- a/src/bin/test_progressbar.c +++ b/src/bin/test_progressbar.c @@ -71,21 +71,22 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); elm_win_title_set(win, "Progressbar"); - evas_object_smart_callback_add(win, "delete-request", my_progressbar_destroy, test); + evas_object_smart_callback_add(win, "delete-request", + my_progressbar_destroy, test); 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_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, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); pb = elm_progressbar_add(win); - evas_object_size_hint_weight_set(pb, 1.0, 1.0); - evas_object_size_hint_align_set(pb, -1.0, 0.5); + evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, pb); // elm_progressbar_horizontal_set(pb, EINA_TRUE); // elm_progressbar_label_set(pb, "Progression %"); @@ -94,8 +95,8 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) _test_progressbar.pb1 = pb; pb = elm_progressbar_add(win); - evas_object_size_hint_align_set(pb, -1.0, 0.5); - evas_object_size_hint_weight_set(pb, 1.0, 1.0); + evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_label_set(pb, "Infinite bounce"); elm_progressbar_pulse_set(pb, EINA_TRUE); elm_box_pack_end(bx, pb); @@ -106,14 +107,15 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic1, buf, NULL); evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + pb = elm_progressbar_add(win); elm_progressbar_label_set(pb, "Label"); elm_progressbar_icon_set(pb, ic1); elm_progressbar_inverted_set(pb, 1); elm_progressbar_unit_format_set(pb, "%1.1f units"); elm_progressbar_span_size_set(pb, 200); - evas_object_size_hint_align_set(pb, -1.0, 0.5); - evas_object_size_hint_weight_set(pb, 1.0, 1.0); + evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, pb); evas_object_show(ic1); evas_object_show(pb); @@ -121,15 +123,15 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) hbx = elm_box_add(win); elm_box_horizontal_set(hbx, EINA_TRUE); - evas_object_size_hint_weight_set(hbx, 1.0, 1.0); - evas_object_size_hint_align_set(hbx, -1.0, -1.0); + evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(hbx, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, hbx); evas_object_show(hbx); pb = elm_progressbar_add(win); elm_progressbar_horizontal_set(pb, EINA_FALSE); - evas_object_size_hint_align_set(pb, -1.0, -1.0); - evas_object_size_hint_weight_set(pb, 1.0, 1.0); + evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(hbx, pb); elm_progressbar_span_size_set(pb, 60); elm_progressbar_label_set(pb, "percent"); @@ -138,8 +140,8 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) pb = elm_progressbar_add(win); elm_progressbar_horizontal_set(pb, EINA_FALSE); - evas_object_size_hint_align_set(pb, -1.0, 0.5); - evas_object_size_hint_weight_set(pb, 1.0, 1.0); + evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_span_size_set(pb, 80); elm_progressbar_pulse_set(pb, EINA_TRUE); elm_progressbar_unit_format_set(pb, NULL); @@ -151,6 +153,7 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) ic2 = elm_icon_add(win); elm_icon_file_set(ic2, buf, NULL); evas_object_size_hint_aspect_set(ic2, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); + pb = elm_progressbar_add(win); elm_progressbar_horizontal_set(pb, EINA_FALSE); elm_progressbar_label_set(pb, "Label"); @@ -158,8 +161,8 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) elm_progressbar_inverted_set(pb, 1); elm_progressbar_unit_format_set(pb, "%1.2f%%"); elm_progressbar_span_size_set(pb, 200); - evas_object_size_hint_align_set(pb, -1.0, 0.5); - evas_object_size_hint_weight_set(pb, 1.0, 1.0); + evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(hbx, pb); evas_object_show(ic2); evas_object_show(pb); @@ -167,7 +170,7 @@ test_progressbar(void *data, Evas_Object *obj, void *event_info) bt_bx = elm_box_add(win); elm_box_horizontal_set(bt_bx, 1); - evas_object_size_hint_weight_set(bt_bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bt_bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, bt_bx); evas_object_show(bt_bx); diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c index 6fba2d0..701693a 100644 --- a/src/bin/test_radio.c +++ b/src/bin/test_radio.c @@ -12,11 +12,11 @@ test_radio(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -24,10 +24,11 @@ test_radio(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + rd = elm_radio_add(win); elm_radio_state_value_set(rd, 0); - evas_object_size_hint_weight_set(rd, 1.0, 1.0); - evas_object_size_hint_align_set(rd, -1.0, 0.5); + evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, 0.5); elm_radio_label_set(rd, "Icon sized to radio"); elm_radio_icon_set(rd, ic); elm_box_pack_end(bx, rd); @@ -39,6 +40,7 @@ test_radio(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); + rd = elm_radio_add(win); elm_radio_state_value_set(rd, 1); elm_radio_group_add(rd, rdg); @@ -67,6 +69,7 @@ test_radio(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); + rd = elm_radio_add(win); elm_radio_state_value_set(rd, 4); elm_radio_group_add(rd, rdg); @@ -79,6 +82,7 @@ test_radio(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); + rd = elm_radio_add(win); elm_radio_state_value_set(rd, 5); elm_radio_group_add(rd, rdg); diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c index 64e20fd..5115f1e 100644 --- a/src/bin/test_scaling.c +++ b/src/bin/test_scaling.c @@ -12,11 +12,11 @@ test_scaling(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -72,11 +72,11 @@ test_scaling2(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c index 0714b52..bcd47c1 100644 --- a/src/bin/test_scroller.c +++ b/src/bin/test_scroller.c @@ -48,12 +48,12 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) elm_win_autodel_set(win, 1); bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); tb = elm_table_add(win); - evas_object_size_hint_weight_set(tb, 1.0, 1.0); + evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); n = 0; for (j = 0; j < 12; j++) @@ -66,8 +66,8 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) n++; if (n >= 9) n = 0; elm_bg_file_set(bg2, buf, NULL); - evas_object_size_hint_weight_set(bg2, 1.0, 1.0); - evas_object_size_hint_align_set(bg2, -1.0, -1.0); + evas_object_size_hint_weight_set(bg2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bg2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_min_set(bg2, 318, 318); elm_table_pack(tb, bg2, i, j, 1, 1); evas_object_show(bg2); @@ -75,7 +75,7 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) } sc = elm_scroller_add(win); - evas_object_size_hint_weight_set(sc, 1.0, 1.0); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, sc); elm_scroller_content_set(sc, tb); @@ -86,13 +86,13 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) evas_object_show(sc); tb2 = elm_table_add(win); - evas_object_size_hint_weight_set(tb2, 1.0, 1.0); + evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, tb2); bt = elm_button_add(win); elm_button_label_set(bt, "to 300 300"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_300_300, sc); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.1, 0.1); elm_table_pack(tb2, bt, 0, 0, 1, 1); evas_object_show(bt); @@ -100,7 +100,7 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "to 900 300"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_900_300, sc); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.9, 0.1); elm_table_pack(tb2, bt, 1, 0, 1, 1); evas_object_show(bt); @@ -108,7 +108,7 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "to 300 900"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_300_900, sc); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.1, 0.9); elm_table_pack(tb2, bt, 0, 1, 1, 1); evas_object_show(bt); @@ -116,7 +116,7 @@ test_scroller(void *data, Evas_Object *obj, void *event_info) bt = elm_button_add(win); elm_button_label_set(bt, "to 900 900"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_900_900, sc); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.9, 0.9); elm_table_pack(tb2, bt, 1, 1, 1, 1); evas_object_show(bt); diff --git a/src/bin/test_separator.c b/src/bin/test_separator.c index 0941b36..cbbeeda 100644 --- a/src/bin/test_separator.c +++ b/src/bin/test_separator.c @@ -12,17 +12,17 @@ test_separator(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx0 = elm_box_add(win); - evas_object_size_hint_weight_set(bx0, 1.0, 1.0); + evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_horizontal_set(bx0, 1); elm_win_resize_object_add(win, bx0); evas_object_show(bx0); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx0, bx); evas_object_show(bx); @@ -47,7 +47,7 @@ test_separator(void *data, Evas_Object *obj, void *event_info) evas_object_show(sp); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx0, bx); evas_object_show(bx); diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c index faa8eff..172519c 100644 --- a/src/bin/test_slider.c +++ b/src/bin/test_slider.c @@ -12,11 +12,11 @@ test_slider(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -24,13 +24,14 @@ test_slider(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + sl = elm_slider_add(win); elm_slider_label_set(sl, "Label"); elm_slider_icon_set(sl, ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); - evas_object_size_hint_align_set(sl, -1.0, 0.5); - evas_object_size_hint_weight_set(sl, 1.0, 1.0); + evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, sl); evas_object_show(ic); evas_object_show(sl); @@ -38,8 +39,8 @@ test_slider(void *data, Evas_Object *obj, void *event_info) sl = elm_slider_add(win); elm_slider_label_set(sl, "Label 2"); elm_slider_span_size_set(sl, 80); - evas_object_size_hint_align_set(sl, -1.0, 0.5); - evas_object_size_hint_weight_set(sl, 1.0, 1.0); + evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_slider_indicator_format_set(sl, "%3.0f"); elm_slider_min_max_set(sl, 50, 150); elm_slider_value_set(sl, 80); @@ -54,8 +55,8 @@ test_slider(void *data, Evas_Object *obj, void *event_info) elm_slider_label_set(sl, "Label 3"); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 40); - evas_object_size_hint_align_set(sl, -1.0, 0.5); - evas_object_size_hint_weight_set(sl, 1.0, 1.0); + evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_slider_indicator_format_set(sl, "%3.0f"); elm_slider_min_max_set(sl, 50, 150); elm_slider_value_set(sl, 80); @@ -69,13 +70,14 @@ test_slider(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); + sl = elm_slider_add(win); elm_slider_icon_set(sl, ic); elm_slider_label_set(sl, "Label 4"); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 60); - evas_object_size_hint_align_set(sl, 0.5, -1.0); - evas_object_size_hint_weight_set(sl, 0.0, 1.0); + evas_object_size_hint_align_set(sl, 0.5, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(sl, 0.0, EVAS_HINT_EXPAND); elm_slider_indicator_format_set(sl, "%1.1f"); elm_slider_value_set(sl, 0.2); elm_object_scale_set(sl, 1.0); diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c index ceece30..51fcd96 100644 --- a/src/bin/test_slideshow.c +++ b/src/bin/test_slideshow.c @@ -83,13 +83,13 @@ test_slideshow(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); slideshow = elm_slideshow_add(win); elm_slideshow_loop_set(slideshow, 1); elm_win_resize_object_add(win, slideshow); - evas_object_size_hint_weight_set(slideshow, 1.0, 1.0); + evas_object_size_hint_weight_set(slideshow, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(slideshow); elm_slideshow_image_add(slideshow, PACKAGE_DATA_DIR"/images/logo.png", NULL); diff --git a/src/bin/test_spinner.c b/src/bin/test_spinner.c index da02026..cacf00e 100644 --- a/src/bin/test_spinner.c +++ b/src/bin/test_spinner.c @@ -11,11 +11,11 @@ test_spinner(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -24,8 +24,8 @@ test_spinner(void *data, Evas_Object *obj, void *event_info) elm_spinner_step_set(sp, 1.3); elm_spinner_wrap_set(sp, 1); elm_spinner_min_max_set(sp, -50.0, 250.0); - evas_object_size_hint_align_set(sp, -1.0, 0.5); - evas_object_size_hint_weight_set(sp, 1.0, 1.0); + evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, sp); evas_object_show(sp); @@ -33,8 +33,8 @@ test_spinner(void *data, Evas_Object *obj, void *event_info) elm_spinner_label_format_set(sp, "Disabled %.0f"); elm_object_disabled_set(sp, 1); elm_spinner_min_max_set(sp, -50.0, 250.0); - evas_object_size_hint_align_set(sp, -1.0, 0.5); - evas_object_size_hint_weight_set(sp, 1.0, 1.0); + evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, sp); evas_object_show(sp); diff --git a/src/bin/test_table.c b/src/bin/test_table.c index a4339d7..8ec607b 100644 --- a/src/bin/test_table.c +++ b/src/bin/test_table.c @@ -10,54 +10,54 @@ test_table(void *data, Evas_Object *obj, void *event_info) elm_win_autodel_set(win, 1); bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, 1.0, 1.0); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); tb = elm_table_add(win); elm_win_resize_object_add(win, tb); - evas_object_size_hint_weight_set(tb, 1.0, 1.0); + evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(tb); bt = elm_button_add(win); elm_button_label_set(bt, "Button 1"); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, bt, 0, 0, 1, 1); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Button 2"); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, bt, 1, 0, 1, 1); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Button 3"); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, bt, 2, 0, 1, 1); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Button 4"); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, bt, 0, 1, 2, 1); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Button 5"); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, bt, 2, 1, 1, 3); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Button 6"); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, bt, 0, 2, 2, 2); evas_object_show(bt); diff --git a/src/bin/test_toggle.c b/src/bin/test_toggle.c index 0ce5891..5c914c4 100644 --- a/src/bin/test_toggle.c +++ b/src/bin/test_toggle.c @@ -12,11 +12,11 @@ test_toggle(void *data, Evas_Object *obj, void *event_info) 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_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -24,9 +24,10 @@ test_toggle(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + tg = elm_toggle_add(win); - evas_object_size_hint_weight_set(tg, 1.0, 1.0); - evas_object_size_hint_align_set(tg, -1.0, 0.5); + evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, 0.5); elm_toggle_label_set(tg, "Icon sized to toggle"); elm_toggle_icon_set(tg, ic); elm_toggle_state_set(tg, 1); @@ -39,6 +40,7 @@ test_toggle(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); + tg = elm_toggle_add(win); elm_toggle_label_set(tg, "Icon no scale"); elm_toggle_icon_set(tg, ic); @@ -50,6 +52,7 @@ test_toggle(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); + tg = elm_toggle_add(win); elm_toggle_label_set(tg, "Icon no scale"); elm_toggle_icon_set(tg, ic); @@ -60,7 +63,8 @@ test_toggle(void *data, Evas_Object *obj, void *event_info) tg = elm_toggle_add(win); elm_toggle_label_set(tg, "Label Only"); - elm_toggle_states_labels_set(tg, "Big long fun times label", "Small long happy fun label"); + elm_toggle_states_labels_set(tg, "Big long fun times label", + "Small long happy fun label"); elm_box_pack_end(bx, tg); evas_object_show(tg); @@ -68,6 +72,7 @@ test_toggle(void *data, Evas_Object *obj, void *event_info) snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); + tg = elm_toggle_add(win); elm_toggle_icon_set(tg, ic); elm_box_pack_end(bx, tg); diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c index ea54465..d1561db 100644 --- a/src/bin/test_win_state.c +++ b/src/bin/test_win_state.c @@ -3,8 +3,7 @@ typedef struct _Testitem { Elm_Genlist_Item *item; - int mode; - int onoff; + int mode, onoff; } Testitem; static void -- 2.7.4