From 7861ee90d5e695bbb315a5224e51a85f3e810201 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 14 Nov 2012 10:49:45 +0000 Subject: [PATCH] elm test: Correct elm_win_resize_object_set() usage. Call evas_object_size_hint_weight_set() before calling elm_win_resize_object_set(). SVN revision: 79281 --- src/bin/test_anim.c | 2 +- src/bin/test_box.c | 9 ++++----- src/bin/test_bubble.c | 2 +- src/bin/test_button.c | 2 +- src/bin/test_calendar.c | 4 ++-- src/bin/test_clock.c | 4 ++-- src/bin/test_cnp.c | 2 +- src/bin/test_conform.c | 3 +-- src/bin/test_ctxpopup.c | 2 +- src/bin/test_cursor.c | 2 +- src/bin/test_dayselector.c | 3 +-- src/bin/test_diskselector.c | 5 ++--- src/bin/test_eio.c | 2 +- src/bin/test_entry.c | 2 +- src/bin/test_external.c | 5 ----- src/bin/test_fileselector.c | 2 +- src/bin/test_fileselector_button.c | 2 +- src/bin/test_fileselector_entry.c | 2 +- src/bin/test_flip.c | 2 +- src/bin/test_focus.c | 3 +-- src/bin/test_focus2.c | 2 +- src/bin/test_gengrid.c | 16 +++++----------- src/bin/test_genlist.c | 4 ++-- src/bin/test_gesture_layer2.c | 2 +- src/bin/test_grid.c | 2 +- src/bin/test_hover.c | 4 ++-- src/bin/test_hoversel.c | 4 ++-- src/bin/test_icon.c | 10 +++------- src/bin/test_image.c | 2 +- src/bin/test_index.c | 6 ++---- src/bin/test_label.c | 1 - src/bin/test_layout.c | 1 - src/bin/test_list.c | 16 +++++++--------- src/bin/test_map.c | 2 +- src/bin/test_naviframe_complex.c | 1 - src/bin/test_notify.c | 2 +- src/bin/test_panel.c | 3 +-- src/bin/test_panes.c | 3 +-- src/bin/test_popup.c | 2 +- src/bin/test_progressbar.c | 2 +- src/bin/test_scaling.c | 2 +- src/bin/test_segment_control.c | 1 - src/bin/test_slideshow.c | 2 +- src/bin/test_table.c | 14 +++++++------- src/bin/test_toolbar.c | 17 ++++++++--------- src/bin/test_tooltip.c | 6 ++---- src/bin/test_weather.c | 3 ++- src/bin/test_web.c | 5 ++--- src/bin/test_win_inline.c | 4 ++-- src/bin/test_win_plug.c | 2 +- src/bin/test_win_socket.c | 3 +-- src/bin/test_win_state.c | 4 ++-- 52 files changed, 87 insertions(+), 121 deletions(-) diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c index 92fbc17..90a8f61 100644 --- a/src/bin/test_anim.c +++ b/src/bin/test_anim.c @@ -78,8 +78,8 @@ test_anim(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); snprintf(buf, sizeof(buf), "%s/images/bubble_sh.png", elm_app_data_dir_get()); diff --git a/src/bin/test_box.c b/src/bin/test_box.c index dbc7653..8c7b03a 100644 --- a/src/bin/test_box.c +++ b/src/bin/test_box.c @@ -138,8 +138,8 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(win); @@ -201,9 +201,9 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); elm_box_padding_set(bx, 10, 10); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); bt = elm_button_add(win); @@ -261,8 +261,8 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(win); @@ -481,7 +481,6 @@ test_box_pack(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in box = elm_box_add(win); elm_box_horizontal_set(box, EINA_TRUE); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, box); evas_object_show(box); @@ -645,8 +644,8 @@ test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); - evas_object_size_hint_weight_set(bx, 1.0, 1.0); evas_object_show(bx); bt = elm_button_add(win); diff --git a/src/bin/test_bubble.c b/src/bin/test_bubble.c index 92a4978..0834386 100644 --- a/src/bin/test_bubble.c +++ b/src/bin/test_bubble.c @@ -115,8 +115,8 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(win); diff --git a/src/bin/test_button.c b/src/bin/test_button.c index 87fc085..204793c 100644 --- a/src/bin/test_button.c +++ b/src/bin/test_button.c @@ -43,9 +43,9 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info scr = elm_scroller_add(win); elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE); elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); + evas_object_size_hint_weight_set(scr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, scr); evas_object_show(scr); - evas_object_size_hint_weight_set(scr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/test_calendar.c b/src/bin/test_calendar.c index a79acc7..cb7fa8e 100644 --- a/src/bin/test_calendar.c +++ b/src/bin/test_calendar.c @@ -125,8 +125,8 @@ test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(win); @@ -339,8 +339,8 @@ test_calendar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); en = elm_entry_add(win); diff --git a/src/bin/test_clock.c b/src/bin/test_clock.c index 3e72c68..49c0c7e 100644 --- a/src/bin/test_clock.c +++ b/src/bin/test_clock.c @@ -105,8 +105,8 @@ test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(bxx); @@ -213,8 +213,8 @@ test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(bxx); diff --git a/src/bin/test_cnp.c b/src/bin/test_cnp.c index 31aad2d..74a266a 100644 --- a/src/bin/test_cnp.c +++ b/src/bin/test_cnp.c @@ -45,8 +45,8 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ gd = elm_grid_add(win); elm_grid_size_set(gd, 100, 100); - elm_win_resize_object_add(win, gd); evas_object_size_hint_weight_set(gd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, gd); evas_object_show(gd); en = elm_entry_add(win); diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c index 0a4dd4b..99bde32 100644 --- a/src/bin/test_conform.c +++ b/src/bin/test_conform.c @@ -14,8 +14,8 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event elm_win_conformant_set(win, EINA_TRUE); conform = elm_conformant_add(win); - elm_win_resize_object_add(win, conform); evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, conform); evas_object_show(conform); bx = elm_box_add(win); @@ -98,7 +98,6 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, bx); evas_object_show(bx); diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c index d12d621..f5061be 100644 --- a/src/bin/test_ctxpopup.c +++ b/src/bin/test_ctxpopup.c @@ -297,8 +297,8 @@ test_ctxpopup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); list = elm_list_add(win); - elm_win_resize_object_add(win, list); evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, list); elm_list_mode_set(list, ELM_LIST_COMPRESS); evas_object_smart_callback_add(list, "selected", _list_clicked, NULL); diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c index 0150b44..7424eef 100644 --- a/src/bin/test_cursor.c +++ b/src/bin/test_cursor.c @@ -106,8 +106,8 @@ test_cursor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); elm_object_cursor_set(bg, ELM_CURSOR_CIRCLE); diff --git a/src/bin/test_dayselector.c b/src/bin/test_dayselector.c index 7d5fc55..d975bf1 100644 --- a/src/bin/test_dayselector.c +++ b/src/bin/test_dayselector.c @@ -49,9 +49,8 @@ test_dayselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event elm_win_autodel_set(win, EINA_TRUE); 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_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_win_resize_object_add(win, bx); evas_object_show(bx); // Default diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c index 5bb7cb1..911f9e5 100644 --- a/src/bin/test_diskselector.c +++ b/src/bin/test_diskselector.c @@ -228,14 +228,13 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); 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_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_win_resize_object_add(win, bx); api->box = bx; evas_object_show(bx); diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c index 8c366f8..c4c59e0 100644 --- a/src/bin/test_eio.c +++ b/src/bin/test_eio.c @@ -204,8 +204,8 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ elm_win_autodel_set(win, EINA_TRUE); vbox = elm_box_add(win); - elm_win_resize_object_add(win, vbox); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, vbox); evas_object_show(vbox); gl = elm_genlist_add(win); diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index 21449e0..6d67d92 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -2038,8 +2038,8 @@ test_entry8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info gd = elm_grid_add(win); elm_grid_size_set(gd, 100, 100); - elm_win_resize_object_add(win, gd); evas_object_size_hint_weight_set(gd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, gd); evas_object_show(gd); rect = evas_object_rectangle_add(evas_object_evas_get(win)); diff --git a/src/bin/test_external.c b/src/bin/test_external.c index c5c468e..b9b3c35 100644 --- a/src/bin/test_external.c +++ b/src/bin/test_external.c @@ -19,7 +19,6 @@ test_external_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e snprintf(buf, sizeof(buf), "%s/objects/test_external.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "external/button"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, ly); evas_object_show(ly); @@ -40,7 +39,6 @@ test_external_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e snprintf(buf, sizeof(buf), "%s/objects/test_external.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "external/slider"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, ly); evas_object_show(ly); @@ -61,7 +59,6 @@ test_external_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void snprintf(buf, sizeof(buf), "%s/objects/test_external.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "external/scroller"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, ly); evas_object_show(ly); @@ -156,7 +153,6 @@ test_external_pbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve snprintf(buf, sizeof(buf), "%s/objects/test_external.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "external/pbar"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, ly); evas_object_show(ly); @@ -181,7 +177,6 @@ test_external_video(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev snprintf(buf, sizeof(buf), "%s/objects/test_external.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "external/video"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, ly); evas_object_show(ly); diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c index 143642d..dd532ff 100644 --- a/src/bin/test_fileselector.c +++ b/src/bin/test_fileselector.c @@ -146,8 +146,8 @@ test_fileselector(void *data __UNUSED__, elm_win_autodel_set(win, EINA_TRUE); vbox = elm_box_add(win); - elm_win_resize_object_add(win, vbox); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, vbox); evas_object_show(vbox); fs = elm_fileselector_add(win); diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c index 969983a..419bcda 100644 --- a/src/bin/test_fileselector_button.c +++ b/src/bin/test_fileselector_button.c @@ -163,8 +163,8 @@ test_fileselector_button(void *data __UNUSED__, evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); vbox = elm_box_add(win); diff --git a/src/bin/test_fileselector_entry.c b/src/bin/test_fileselector_entry.c index 98ab423..d21b235 100644 --- a/src/bin/test_fileselector_entry.c +++ b/src/bin/test_fileselector_entry.c @@ -168,8 +168,8 @@ test_fileselector_entry(void *data __UNUSED__, evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); vbox = elm_box_add(win); diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c index d920946..16c3352 100644 --- a/src/bin/test_flip.c +++ b/src/bin/test_flip.c @@ -221,8 +221,8 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), "sky_01.jpg"); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c index 607d4b1..fec2534 100644 --- a/src/bin/test_focus.c +++ b/src/bin/test_focus.c @@ -66,9 +66,8 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info Evas_Object *mainbx = elm_box_add(win); elm_box_horizontal_set(mainbx, EINA_TRUE); + evas_object_size_hint_weight_set(mainbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, mainbx); - evas_object_size_hint_weight_set(mainbx, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); my_show(mainbx); { //First Col diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c index 21bff04..bc59ecf 100644 --- a/src/bin/test_focus2.c +++ b/src/bin/test_focus2.c @@ -63,8 +63,8 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _focus_out, NULL); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); #define PARENT bx /* this is broken, but should work */ diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c index 6607a8f..a6cdca7 100644 --- a/src/bin/test_gengrid.c +++ b/src/bin/test_gengrid.c @@ -375,16 +375,13 @@ filled_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_win_autodel_set(win, EINA_TRUE); box = elm_box_add(win); - elm_win_resize_object_add(win, box); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, box); evas_object_show(box); content_box = elm_box_add(win); + evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, content_box); - evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, - EVAS_HINT_FILL); elm_box_pack_end(box, content_box); evas_object_show(content_box); @@ -433,16 +430,13 @@ cursor_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_win_autodel_set(win, EINA_TRUE); box = elm_box_add(win); - elm_win_resize_object_add(win, box); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, box); evas_object_show(box); content_box = elm_box_add(win); + evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, content_box); - evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, - EVAS_HINT_FILL); elm_box_pack_end(box, content_box); evas_object_show(content_box); @@ -496,8 +490,8 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf bxx = elm_box_add(win); api->box = bxx; - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); content_box = elm_box_add(win); diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 68207cb..edac591 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -260,8 +260,8 @@ test_genlist(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); bx = elm_box_add(win); @@ -518,8 +518,8 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); diff --git a/src/bin/test_gesture_layer2.c b/src/bin/test_gesture_layer2.c index 4d71521..df54f8d 100644 --- a/src/bin/test_gesture_layer2.c +++ b/src/bin/test_gesture_layer2.c @@ -537,9 +537,9 @@ test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, bx = elm_box_add(win); tb = elm_table_add(win); elm_box_pack_end(bx, tb); - elm_win_resize_object_add(win, bx); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tb, 0.5, 0.5); + elm_win_resize_object_add(win, bx); evas_object_show(tb); evas_object_show(bx); diff --git a/src/bin/test_grid.c b/src/bin/test_grid.c index f08c060..2a7a5f4 100644 --- a/src/bin/test_grid.c +++ b/src/bin/test_grid.c @@ -106,8 +106,8 @@ test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ gd = elm_grid_add(win); elm_grid_size_set(gd, 100, 100); - elm_win_resize_object_add(win, gd); evas_object_size_hint_weight_set(gd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, gd); api->data.grid = gd; evas_object_show(gd); diff --git a/src/bin/test_hover.c b/src/bin/test_hover.c index 5d05231..6d928c4 100644 --- a/src/bin/test_hover.c +++ b/src/bin/test_hover.c @@ -28,8 +28,8 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); @@ -110,8 +110,8 @@ test_hover2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c index 950e9b0..7c227f6 100644 --- a/src/bin/test_hoversel.c +++ b/src/bin/test_hoversel.c @@ -102,13 +102,13 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); 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); + elm_win_resize_object_add(win, bx); api->box = bx; evas_object_show(bx); diff --git a/src/bin/test_icon.c b/src/bin/test_icon.c index 1c048fa..62753d3 100644 --- a/src/bin/test_icon.c +++ b/src/bin/test_icon.c @@ -35,13 +35,12 @@ bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); ic = elm_icon_add(win); + evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, ic); snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg", elm_app_data_dir_get()); elm_image_file_set(ic, buf, NULL); - evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE); elm_image_aspect_fixed_set(ic, EINA_FALSE); elm_image_preload_disabled_set(ic, EINA_TRUE); @@ -60,16 +59,13 @@ test_icon(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_win_autodel_set(win, EINA_TRUE); box = elm_box_add(win); - elm_win_resize_object_add(win, box); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, box); evas_object_show(box); content_box = elm_box_add(win); + evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, content_box); - evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, - EVAS_HINT_FILL); elm_box_pack_end(box, content_box); evas_object_show(content_box); diff --git a/src/bin/test_image.c b/src/bin/test_image.c index 7747a53..4809a64 100644 --- a/src/bin/test_image.c +++ b/src/bin/test_image.c @@ -42,8 +42,8 @@ test_image(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); box = elm_box_add(win); - elm_win_resize_object_add(win, box); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, box); evas_object_show(box); im = elm_image_add(win); diff --git a/src/bin/test_index.c b/src/bin/test_index.c index 2c947a9..ad6bc51 100644 --- a/src/bin/test_index.c +++ b/src/bin/test_index.c @@ -172,8 +172,8 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); gl = elm_genlist_add(win); @@ -183,7 +183,6 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info api->dt.id = id = elm_index_add(win); evas_object_size_hint_weight_set(id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(id, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, id); bt = elm_button_add(win); @@ -344,8 +343,7 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(box); gui->id = elm_index_add(win); - evas_object_size_hint_weight_set(gui->id, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(gui->id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, gui->id); evas_object_smart_callback_add(gui->id, "delay,changed", test_index2_id_changed, NULL); diff --git a/src/bin/test_label.c b/src/bin/test_label.c index b217407..6bf9aad 100644 --- a/src/bin/test_label.c +++ b/src/bin/test_label.c @@ -22,7 +22,6 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); lb = elm_label_add(win); elm_object_text_set(lb, diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c index 90826cb..cb973a3 100644 --- a/src/bin/test_layout.c +++ b/src/bin/test_layout.c @@ -45,7 +45,6 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info box = elm_box_add(win); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, box); evas_object_show(box); diff --git a/src/bin/test_list.c b/src/bin/test_list.c index b6030ed..7db3fe1 100644 --- a/src/bin/test_list.c +++ b/src/bin/test_list.c @@ -296,8 +296,8 @@ test_list(void *data __UNUSED__, evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); li = elm_list_add(win); @@ -454,8 +454,8 @@ test_list_horizontal(void *data __UNUSED__, li = elm_list_add(win); elm_list_horizontal_set(li, EINA_TRUE); elm_list_mode_set(li, ELM_LIST_LIMIT); - elm_win_resize_object_add(win, li); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, li); ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); @@ -596,8 +596,8 @@ test_list2(void *data __UNUSED__, bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); @@ -733,8 +733,8 @@ test_list3(void *data __UNUSED__, elm_win_autodel_set(win, EINA_TRUE); li = elm_list_add(win); - elm_win_resize_object_add(win, li); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, li); elm_list_mode_set(li, ELM_LIST_COMPRESS); ic = elm_icon_add(win); @@ -891,9 +891,8 @@ test_list4(void *data __UNUSED__, info.win = win; naviframe = elm_naviframe_add(win); - elm_win_resize_object_add(win, naviframe); evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(naviframe, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_win_resize_object_add(win, naviframe); evas_object_show(naviframe); info.naviframe = naviframe; @@ -1116,8 +1115,8 @@ test_list6(void *data __UNUSED__, gd = elm_grid_add(win); elm_grid_size_set(gd, 100, 100); - elm_win_resize_object_add(win, gd); evas_object_size_hint_weight_set(gd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, gd); li = elm_list_add(win); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1199,12 +1198,11 @@ test_list7(void *data __UNUSED__, bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); li = elm_list_add(win); - 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_win_resize_object_add(win, li); elm_list_select_mode_set(li, ELM_OBJECT_SELECT_MODE_ALWAYS); diff --git a/src/bin/test_map.c b/src/bin/test_map.c index 729ba6a..892dcc2 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -548,8 +548,8 @@ _track_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) elm_win_autodel_set(fs_win, 1); vbox = elm_box_add(fs_win); - elm_win_resize_object_add(fs_win, vbox); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(fs_win, vbox); evas_object_show(vbox); fs = elm_fileselector_add(fs_win); diff --git a/src/bin/test_naviframe_complex.c b/src/bin/test_naviframe_complex.c index 5bf8619..50f97c6 100644 --- a/src/bin/test_naviframe_complex.c +++ b/src/bin/test_naviframe_complex.c @@ -317,7 +317,6 @@ test_naviframe_complex(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void box = elm_box_add(win); EXPAND(box); - FILL(box); elm_box_horizontal_set(box, EINA_TRUE); elm_win_resize_object_add(win, box); evas_object_show(box); diff --git a/src/bin/test_notify.c b/src/bin/test_notify.c index c3cb8bf..4d9eaeb 100644 --- a/src/bin/test_notify.c +++ b/src/bin/test_notify.c @@ -46,8 +46,8 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); tb = elm_table_add(win); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_show(tb); // Notify top diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c index 998f087..39de33c 100644 --- a/src/bin/test_panel.c +++ b/src/bin/test_panel.c @@ -161,9 +161,8 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); vbx = elm_box_add(win); - elm_win_resize_object_add(win, vbx); evas_object_size_hint_weight_set(vbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(vbx, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_win_resize_object_add(win, vbx); evas_object_show(vbx); bx = elm_box_add(win); diff --git a/src/bin/test_panes.c b/src/bin/test_panes.c index bf8d091..7ea43ac 100644 --- a/src/bin/test_panes.c +++ b/src/bin/test_panes.c @@ -55,9 +55,8 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bg); panes = elm_panes_add(win); - elm_win_resize_object_add(win, panes); evas_object_size_hint_weight_set(panes, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(panes, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_win_resize_object_add(win, panes); evas_object_show(panes); evas_object_smart_callback_add(panes, "clicked", _clicked, panes); diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c index f5be1b8..fcbaca9 100644 --- a/src/bin/test_popup.c +++ b/src/bin/test_popup.c @@ -333,9 +333,9 @@ test_popup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, elm_win_autodel_set(win, EINA_TRUE); list = elm_list_add(win); + evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, list); elm_list_mode_set(list, ELM_LIST_LIMIT); - evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_smart_callback_add(list, "selected", _list_click, NULL); elm_list_item_append(list, "popup-center-text", NULL, NULL, diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c index 7d50f54..b984662 100644 --- a/src/bin/test_progressbar.c +++ b/src/bin/test_progressbar.c @@ -91,8 +91,8 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event my_progressbar_destroy, NULL); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); pb = elm_progressbar_add(win); diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c index 9e5f26e..7cf2d4f 100644 --- a/src/bin/test_scaling.c +++ b/src/bin/test_scaling.c @@ -66,8 +66,8 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c index 8c4f036..bbaaf1b 100644 --- a/src/bin/test_segment_control.c +++ b/src/bin/test_segment_control.c @@ -39,7 +39,6 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e bx = elm_box_add(win); elm_box_padding_set(bx, 0, 10); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_win_resize_object_add(win, bx); for (i = 0; i < EINA_C_ARRAY_LENGTH(exp_modes); i++) diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c index 2d8d86a..5aefbd2 100644 --- a/src/bin/test_slideshow.c +++ b/src/bin/test_slideshow.c @@ -120,8 +120,8 @@ test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i slideshow = elm_slideshow_add(win); elm_slideshow_loop_set(slideshow, EINA_TRUE); - elm_win_resize_object_add(win, slideshow); evas_object_size_hint_weight_set(slideshow, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, slideshow); evas_object_show(slideshow); itc.func.get = _get; diff --git a/src/bin/test_table.c b/src/bin/test_table.c index 4f40608..a655e30 100644 --- a/src/bin/test_table.c +++ b/src/bin/test_table.c @@ -12,8 +12,8 @@ test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); tb = elm_table_add(win); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_show(tb); bt = elm_button_add(win); @@ -71,8 +71,8 @@ test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tb = elm_table_add(win); elm_table_homogeneous_set(tb, EINA_TRUE); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_show(tb); bt = elm_button_add(win); @@ -140,8 +140,8 @@ test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); tb = elm_table_add(win); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_data_set(win, "tb", tb); evas_object_show(tb); @@ -184,8 +184,8 @@ test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_autodel_set(win, EINA_TRUE); tb = elm_table_add(win); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_data_set(win, "tb", tb); evas_object_show(tb); @@ -229,8 +229,8 @@ test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tb = elm_table_add(win); elm_table_homogeneous_set(tb, EINA_TRUE); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_show(tb); bt = elm_button_add(win); @@ -281,8 +281,8 @@ test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tb = elm_table_add(win); elm_table_homogeneous_set(tb, EINA_TRUE); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_show(tb); bt = elm_button_add(win); @@ -340,8 +340,8 @@ test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tb = elm_table_add(win); elm_table_padding_set(tb, 10, 20); - elm_win_resize_object_add(win, tb); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, tb); evas_object_show(tb); bt = elm_button_add(win); diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c index 5d2aada..714c6e6 100644 --- a/src/bin/test_toolbar.c +++ b/src/bin/test_toolbar.c @@ -91,8 +91,8 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -195,8 +195,8 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -299,8 +299,8 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -403,8 +403,8 @@ test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -507,8 +507,8 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -615,10 +615,9 @@ test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); elm_box_horizontal_set(bx, EINA_TRUE); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -720,8 +719,8 @@ test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); @@ -824,8 +823,8 @@ test_toolbar8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); tb = elm_toolbar_add(win); diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 636423f..8cc1450 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -379,8 +379,7 @@ test_tooltip(void *data __UNUSED__, elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -532,8 +531,7 @@ test_tooltip2(void *data __UNUSED__, elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); + 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_weather.c b/src/bin/test_weather.c index 062a9a0..0e2bdce 100644 --- a/src/bin/test_weather.c +++ b/src/bin/test_weather.c @@ -70,8 +70,8 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf #ifdef HAVE_ELEMENTARY_EWEATHER 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); fl = elm_flip_add(win); @@ -159,6 +159,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf Evas_Object *lbl; lbl = elm_label_add(win); + evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, lbl); elm_object_text_set(lbl, "libeweather is required to display the forecast."); evas_object_show(lbl); diff --git a/src/bin/test_web.c b/src/bin/test_web.c index 714477b..b3bfcfb 100644 --- a/src/bin/test_web.c +++ b/src/bin/test_web.c @@ -99,8 +99,7 @@ _new_window_hook(void *data, Evas_Object *obj __UNUSED__, Eina_Bool js __UNUSED_ new_web = elm_web_add(new_win); elm_web_useragent_set(new_web, wt->user_agent); - evas_object_size_hint_weight_set(new_web, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(new_web, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(new_win, new_web); evas_object_show(new_web); @@ -354,8 +353,8 @@ test_web(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ elm_win_autodel_set(win, EINA_TRUE); 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); + elm_win_resize_object_add(win, bx); evas_object_show(bx); bx2 = elm_box_add(win); diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c index 04a03bf..b4bda92 100644 --- a/src/bin/test_win_inline.c +++ b/src/bin/test_win_inline.c @@ -13,8 +13,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) if (do_bg) { 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); } @@ -222,8 +222,8 @@ test_win_inline(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); win2 = elm_win_add(win, "inlined", ELM_WIN_INLINED_IMAGE); diff --git a/src/bin/test_win_plug.c b/src/bin/test_win_plug.c index 08a8ebb..bab48e2 100644 --- a/src/bin/test_win_plug.c +++ b/src/bin/test_win_plug.c @@ -147,8 +147,8 @@ test_win_plug(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); plug = elm_plug_add(win); diff --git a/src/bin/test_win_socket.c b/src/bin/test_win_socket.c index d4f7ef5..600ccf9 100644 --- a/src/bin/test_win_socket.c +++ b/src/bin/test_win_socket.c @@ -20,8 +20,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) if (do_bg) { 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); } @@ -153,7 +153,6 @@ test_win_socket(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); lb = elm_label_add(win); elm_object_text_set(lb, diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c index e0fb8cc..a54726c 100644 --- a/src/bin/test_win_state.c +++ b/src/bin/test_win_state.c @@ -124,8 +124,8 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i 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); + elm_win_resize_object_add(win, bg); evas_object_show(bg); evas_object_data_set(win, "bg", bg); @@ -250,8 +250,8 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); - elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); evas_object_show(bg); evas_object_data_set(win, "bg", bg); -- 2.7.4