NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples: refactoring about elm_win_resize_object_add. 

1. call evas_object_size_hint_weight_set() before calling elm_win_resize_object_add() as documented.
2. evas_object_size_hint_align_set() is not needed for elm_win_resize_object_add().
This commit is contained in:
Daniel Juyung Seo 2013-06-27 08:26:42 +09:00
parent be9e031e07
commit a4e8501ed6
32 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/examples/calendar_example_01.c
View File

@ -21,8 +21,8 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, cal);
evas_object_show(cal);
evas_object_show(win);

2
legacy/elementary/src/examples/calendar_example_02.c
View File

@ -36,8 +36,8 @@ elm_main(int argc, char **argv)
elm_win_autodel_set(win, EINA_TRUE);
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, cal);
elm_calendar_format_function_set(cal, _format_month_year);
elm_calendar_weekdays_names_set(cal, weekdays);

2
legacy/elementary/src/examples/calendar_example_03.c
View File

@ -23,8 +23,8 @@ elm_main(int argc, char **argv)
elm_win_autodel_set(win, EINA_TRUE);
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, cal);
elm_calendar_min_max_year_set(cal, 2020, 2022);
evas_object_show(cal);

2
legacy/elementary/src/examples/calendar_example_04.c
View File

@ -26,8 +26,8 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
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);
cal = elm_calendar_add(win);

2
legacy/elementary/src/examples/calendar_example_05.c
View File

@ -46,8 +46,8 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, cal);
/* Add callback to display calendar information every time user
* selects a new date */
evas_object_smart_callback_add(cal, "changed", _print_cal_info_cb, NULL);

2
legacy/elementary/src/examples/calendar_example_06.c
View File

@ -40,8 +40,8 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
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);
cal = elm_calendar_add(win);

1
legacy/elementary/src/examples/colorselector_example_01.c
View File

@ -19,7 +19,6 @@ elm_main(int argc, char **argv)
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);

6
legacy/elementary/src/examples/conformant_example_01.c
View File

@ -22,9 +22,9 @@ elm_main(int argc, char **argv)
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);
btn = elm_button_add(win);
elm_object_text_set(btn, "Test Conformant");
@ -58,8 +58,6 @@ elm_main(int argc, char **argv)
elm_box_pack_end(bx, btn);
evas_object_show(btn);
evas_object_show(bx);
evas_object_resize(win, 240, 480);
evas_object_show(win);

2
legacy/elementary/src/examples/conformant_example_02.c
View File

@ -22,8 +22,8 @@ elm_main(int argc, char **argv)
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);

1
legacy/elementary/src/examples/diskselector_example_01.c
View File

@ -34,7 +34,6 @@ elm_main(int argc, char **argv)
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);

2
legacy/elementary/src/examples/fileselector_button_example.c
View File

@ -89,8 +89,8 @@ elm_main(int argc,
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);
ic = elm_icon_add(win);

2
legacy/elementary/src/examples/fileselector_entry_example.c
View File

@ -87,8 +87,8 @@ elm_main(int argc,
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);
ic = elm_icon_add(win);

3
legacy/elementary/src/examples/fileselector_example.c
View File

@ -119,10 +119,9 @@ elm_main(int argc,
elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
elm_box_horizontal_set(bx, EINA_TRUE);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
/* evas_object_size_hint_align_set(fs, EVAS_HINT_FILL, EVAS_HINT_FILL); */
elm_win_resize_object_add(win, bx);
evas_object_show(bx);
vbox = elm_box_add(win);

2
legacy/elementary/src/examples/general_funcs_example.c
View File

@ -93,7 +93,6 @@ elm_main(int argc,
/* outer box */
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);
@ -113,7 +112,6 @@ elm_main(int argc,
b = elm_box_add(win);
elm_box_horizontal_set(b, EINA_FALSE);
evas_object_size_hint_weight_set(b, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(b, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, b);
elm_box_pack_end(box, b);
evas_object_show(b);

5
legacy/elementary/src/examples/index_example_01.c
View File

@ -110,8 +110,8 @@ elm_main(int argc,
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);
d.list = elm_list_add(win);
@ -122,10 +122,9 @@ elm_main(int argc,
elm_box_pack_end(vbox, d.list);
d.index = elm_index_add(win);
elm_win_resize_object_add(win, d.index);
evas_object_size_hint_weight_set(d.index, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(d.list, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, d.index);
evas_object_show(d.index);
for (i = 0; i < (sizeof(dict) / sizeof(dict[0])); i++)

1
legacy/elementary/src/examples/index_example_02.c
View File

@ -111,7 +111,6 @@ elm_main(int argc,
idx = elm_index_add(win);
evas_object_size_hint_weight_set(idx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, idx);
evas_object_show(idx);
for (i = 0; i < (sizeof(items) / sizeof(items[0])); i++)

1
legacy/elementary/src/examples/list_example_01.c
View File

@ -34,7 +34,6 @@ elm_main(int argc, char **argv)
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);

2
legacy/elementary/src/examples/map_example_01.c
View File

@ -65,8 +65,8 @@ elm_main(int argc, char **argv)
elm_win_autodel_set(win, EINA_TRUE);
map = elm_map_add(win);
elm_win_resize_object_add(win, map);
evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, map);
evas_object_show(map);
box = elm_box_add(win);

2
legacy/elementary/src/examples/map_example_02.c
View File

@ -181,8 +181,8 @@ elm_main(int argc, char **argv)
elm_win_autodel_set(win, EINA_TRUE);
map = elm_map_add(win);
elm_win_resize_object_add(win, map);
evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, map);
evas_object_show(map);
box = elm_box_add(win);

10
legacy/elementary/src/examples/map_example_03.c
View File

@ -120,11 +120,14 @@ elm_main(int argc, char **argv)
elm_win_autodel_set(win, EINA_TRUE);
map = elm_map_add(win);
elm_win_resize_object_add(win, map);
evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, map);
evas_object_show(map);
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);
elm_win_resize_object_add(win, box);
evas_object_show(box);
bt = elm_button_add(win);
@ -155,11 +158,6 @@ elm_main(int argc, char **argv)
evas_object_smart_callback_add(bt, "clicked", _bt_zoom_fill, map);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0);
elm_box_horizontal_set(box, EINA_TRUE);
elm_win_resize_object_add(win, box);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, 0);
entry = elm_entry_add(win);
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_single_line_set(entry, EINA_TRUE);

1
legacy/elementary/src/examples/mapbuf_example.c
View File

@ -44,7 +44,6 @@ elm_main(int argc, char **argv)
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);

1
legacy/elementary/src/examples/menu_example_01.c
View File

@ -33,6 +33,7 @@ elm_main(int argc, char **argv)
rect = evas_object_rectangle_add(evas_object_evas_get(win));
elm_win_resize_object_add(win, rect);
evas_object_size_hint_min_set(rect, 0, 0);
evas_object_color_set(rect, 0, 0, 0, 0);
evas_object_show(rect);

1
legacy/elementary/src/examples/panel_example_01.c
View File

@ -16,7 +16,6 @@ elm_main(int argc, char **argv)
bx = elm_box_add(win);
elm_box_horizontal_set(bx, EINA_FALSE);
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);

3
legacy/elementary/src/examples/panes_example.c
View File

@ -61,9 +61,8 @@ elm_main(int argc, char **argv)
elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
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);
bt = elm_button_add(win);

2
legacy/elementary/src/examples/progressbar_example.c
View File

@ -159,8 +159,8 @@ elm_main(int argc,
evas_object_smart_callback_add(win, "delete,request", _on_done, 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 with no label, default unit label and no icon */

1
legacy/elementary/src/examples/radio_example_01.c
View File

@ -20,7 +20,6 @@ elm_main(int argc, char **argv)
bx = elm_box_add(win);
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);
elm_win_resize_object_add(win, bx);
evas_object_show(bx);

1
legacy/elementary/src/examples/separator_example_01.c
View File

@ -16,7 +16,6 @@ elm_main(int argc, char **argv)
bx = elm_box_add(win);
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);
elm_win_resize_object_add(win, bx);
evas_object_show(bx);

3
legacy/elementary/src/examples/toolbar_example_01.c
View File

@ -45,9 +45,8 @@ elm_main(int argc, char **argv)
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);
bt = elm_button_add(win);

3
legacy/elementary/src/examples/toolbar_example_02.c
View File

@ -31,9 +31,8 @@ elm_main(int argc, char **argv)
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);
bt = elm_button_add(win);

3
legacy/elementary/src/examples/toolbar_example_03.c
View File

@ -23,9 +23,8 @@ elm_main(int argc, char **argv)
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);
bt = elm_button_add(win);

1
legacy/elementary/src/examples/transit_example_03.c
View File

@ -189,7 +189,6 @@ elm_main(int argc, char **argv)
/* add a vertical box that will hold everything */
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);

1
legacy/elementary/src/examples/transit_example_04.c
View File

@ -95,7 +95,6 @@ elm_main(int argc, char **argv)
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);