enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Elementary: Changed homogenous to homogeneous. 

Deprecated existing APIs but not removed them. They will be removed
sometime later or when elm 1.0 is released. And added new APIs.
I fixed box, table and toolbar. I will modify other codes in trunk soon.


SVN revision: 59160
This commit is contained in:
Daniel Juyung Seo 2011-05-04 04:53:39 +00:00
parent a1cb0189c3
commit 04b491da11
19 changed files with 113 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/src/bin/config.c
View File

@ -2213,7 +2213,7 @@ _status_config_profiles(Evas_Object *win,
evas_object_size_hint_weight_set(fr_bx1, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(fr_bx1, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_homogenous_set(fr_bx1, EINA_TRUE);
elm_box_homogeneous_set(fr_bx1, EINA_TRUE);
evas_object_show(fr_bx1);
fr_bx2 = elm_box_add(win);
@ -2855,7 +2855,7 @@ _status_config_full(Evas_Object *win,
tb = elm_toolbar_add(win);
elm_toolbar_menu_parent_set(tb, win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
evas_object_size_hint_weight_set(tb, 1.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);

2
legacy/elementary/src/bin/test_cursor.c
View File

@ -197,7 +197,7 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
evas_object_show(bx);
o = elm_toolbar_add(win);
elm_toolbar_homogenous_set(o, 0);
elm_toolbar_homogeneous_set(o, 0);
evas_object_size_hint_weight_set(o, 0.0, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
tit = elm_toolbar_item_append(o, NULL, "Bogosity", NULL, NULL);

2
legacy/elementary/src/bin/test_entry.c
View File

@ -1621,7 +1621,7 @@ test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);

2
legacy/elementary/src/bin/test_flip.c
View File

@ -235,7 +235,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);

20
legacy/elementary/src/bin/test_genlist.c
View File

@ -399,7 +399,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -440,7 +440,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -473,7 +473,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx3 = elm_box_add(win);
elm_box_horizontal_set(bx3, EINA_TRUE);
elm_box_homogenous_set(bx3, EINA_TRUE);
elm_box_homogeneous_set(bx3, EINA_TRUE);
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);
@ -616,7 +616,7 @@ test_genlist3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -753,7 +753,7 @@ test_genlist4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -984,7 +984,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -1158,7 +1158,7 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -1228,7 +1228,7 @@ test_genlist7_swipe(void *data, Evas_Object *obj __UNUSED__, void *event_info)
if ((!event_info) || (!data)) return;
box = elm_box_add(info->win);
elm_box_homogenous_set(box, EINA_FALSE);
elm_box_homogeneous_set(box, EINA_FALSE);
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);
evas_object_show(box);
@ -1386,7 +1386,7 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -1424,7 +1424,7 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
bx3 = elm_box_add(win);
elm_box_horizontal_set(bx3, EINA_TRUE);
elm_box_homogenous_set(bx3, EINA_TRUE);
elm_box_homogeneous_set(bx3, EINA_TRUE);
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);

6
legacy/elementary/src/bin/test_launcher.c
View File

@ -213,7 +213,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(bg);
bx = elm_box_add(win);
elm_box_homogenous_set(bx, EINA_TRUE);
elm_box_homogeneous_set(bx, EINA_TRUE);
elm_box_horizontal_set(bx, EINA_TRUE);
sc = elm_scroller_add(win);
@ -396,7 +396,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
evas_object_show(bg);
bx = elm_box_add(win);
elm_box_homogenous_set(bx, EINA_TRUE);
elm_box_homogeneous_set(bx, EINA_TRUE);
elm_box_horizontal_set(bx, EINA_TRUE);
for (k = 0 ; k < 8; k++)
@ -746,7 +746,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
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_box_homogenous_set(bx, EINA_TRUE);
elm_box_homogeneous_set(bx, EINA_TRUE);
elm_box_horizontal_set(bx, EINA_TRUE);
sc = elm_scroller_add(win);

4
legacy/elementary/src/bin/test_list.c
View File

@ -432,7 +432,7 @@ test_list2(void *data __UNUSED__,
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
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);
@ -605,7 +605,7 @@ test_list4_swipe(void *data,
box = elm_box_add(info->win);
elm_box_horizontal_set(box, EINA_FALSE);
elm_box_homogenous_set(box, EINA_FALSE);
elm_box_homogeneous_set(box, EINA_FALSE);
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);
evas_object_show(box);

4
legacy/elementary/src/bin/test_panel.c
View File

@ -180,7 +180,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_align_set(panel, EVAS_HINT_FILL, EVAS_HINT_FILL);
toolbar = elm_toolbar_add(win);
elm_toolbar_homogenous_set(toolbar, 0);
elm_toolbar_homogeneous_set(toolbar, 0);
elm_toolbar_mode_shrink_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -244,7 +244,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_panel_hidden_set(panel, EINA_TRUE);
toolbar = elm_toolbar_add(win);
elm_toolbar_homogenous_set(toolbar, 0);
elm_toolbar_homogeneous_set(toolbar, 0);
elm_toolbar_mode_shrink_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);

2
legacy/elementary/src/bin/test_table.c
View File

@ -82,7 +82,7 @@ test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_show(bg);
tb = elm_table_add(win);
elm_table_homogenous_set(tb, EINA_TRUE);
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);
evas_object_show(tb);

18
legacy/elementary/src/bin/test_toolbar.c
View File

@ -85,7 +85,7 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
evas_object_show(bx);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU);
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
@ -126,7 +126,7 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
evas_object_show(tb);
tb = elm_table_add(win);
//elm_table_homogenous_set(tb, 1);
//elm_table_homogeneous_set(tb, 1);
evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -195,7 +195,7 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(bx);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
@ -236,7 +236,7 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(tb);
tb = elm_table_add(win);
//elm_table_homogenous_set(tb, 1);
//elm_table_homogeneous_set(tb, 1);
evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -305,7 +305,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(bx);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_NONE);
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
@ -346,7 +346,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(tb);
tb = elm_table_add(win);
//elm_table_homogenous_set(tb, 1);
//elm_table_homogeneous_set(tb, 1);
evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -416,7 +416,7 @@ test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(bx);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_HIDE);
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
@ -526,7 +526,7 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(bx);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU);
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
@ -571,7 +571,7 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(tb);
tb = elm_table_add(win);
//elm_table_homogenous_set(tb, 1);
//elm_table_homogeneous_set(tb, 1);
evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);

2
legacy/elementary/src/bin/test_tooltip.c
View File

@ -333,7 +333,7 @@ test_tooltip(void *data __UNUSED__,
evas_object_show(bx);
tb = elm_toolbar_add(win);
elm_toolbar_homogenous_set(tb, 0);
elm_toolbar_homogeneous_set(tb, 0);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
elm_box_pack_end(bx, tb);

10
legacy/elementary/src/bin/test_win_state.c
View File

@ -136,7 +136,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -161,7 +161,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -191,7 +191,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -294,7 +294,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -324,7 +324,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
elm_box_homogenous_set(bx2, EINA_TRUE);
elm_box_homogeneous_set(bx2, EINA_TRUE);
evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);

18
legacy/elementary/src/lib/Elementary.h.in
View File

@ -706,8 +706,10 @@ extern "C" {
EAPI Evas_Object *elm_box_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
EAPI void elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_box_horizontal_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_box_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_box_homogeneous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI void elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI Eina_Bool elm_box_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj) EINA_ARG_NONNULL(1);
EAPI void elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj) EINA_ARG_NONNULL(1);
EAPI void elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before) EINA_ARG_NONNULL(1);
@ -912,8 +914,10 @@ extern "C" {
/* table */
EAPI Evas_Object *elm_table_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
EAPI void elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_table_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_table_homogeneous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI void elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI Eina_Bool elm_table_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical) EINA_ARG_NONNULL(1);
EAPI void elm_table_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical) EINA_ARG_NONNULL(1);
EAPI void elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h) EINA_ARG_NONNULL(1);
@ -1526,8 +1530,10 @@ extern "C" {
EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Toolbar_Item *item) EINA_ARG_NONNULL(1);
EAPI void elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode) EINA_ARG_NONNULL(1);
EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_mode_shrink_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_toolbar_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) EINA_ARG_NONNULL(1);
EAPI Eina_Bool elm_toolbar_homogeneous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI void elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent) EINA_ARG_NONNULL(1);
EAPI Evas_Object *elm_toolbar_menu_parent_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_toolbar_align_set(Evas_Object *obj, double align) EINA_ARG_NONNULL(1);

2
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -194,7 +194,7 @@ _activate(Evas_Object *obj)
bx = elm_box_add(wd->hover);
elm_widget_mirrored_automatic_set(bx, EINA_FALSE);
elm_box_homogenous_set(bx, 1);
elm_box_homogeneous_set(bx, 1);
elm_box_horizontal_set(bx, wd->horizontal);

30
legacy/elementary/src/lib/elm_box.c
View File

@ -436,23 +436,23 @@ elm_box_horizontal_get(const Evas_Object *obj)
}
/**
* Set homogenous layout
* Set homogeneous layout
*
* If enabled, homogenous layout makes all items the same size. This size is
* If enabled, homogeneous layout makes all items the same size. This size is
* of course governed by the size of the largest item in the box.
*
* @param obj The box object
* @param homogenous The homogenous flag (1 = on, 2 = off)
* @param homogeneous The homogeneous flag (1 = on, 2 = off)
*
* @ingroup Box
*/
EAPI void
elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->homogeneous = !!homogenous;
wd->homogeneous = !!homogeneous;
evas_object_smart_calculate(wd->box);
/*if (wd->horizontal)
{
@ -474,16 +474,22 @@ elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
} */
}
EINA_DEPRECATED EAPI void
elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
{
elm_box_homogeneous_set(obj, homogenous);
}
/**
* Get homogenous layout
* Get homogeneous layout
*
* @param obj The box object
* @return If is homogenous
* @return If is homogeneous
*
* @ingroup Box
*/
EAPI Eina_Bool
elm_box_homogenous_get(const Evas_Object *obj)
elm_box_homogeneous_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
@ -491,6 +497,12 @@ elm_box_homogenous_get(const Evas_Object *obj)
return wd->homogeneous;
}
EINA_DEPRECATED EAPI Eina_Bool
elm_box_homogenous_get(const Evas_Object *obj)
{
return elm_box_homogeneous_get(obj);
}
/**
* This adds a box at the start of the box (top or left based on orientation)
*
@ -650,7 +662,7 @@ elm_box_unpack_all(Evas_Object *obj)
* @note Changing the layout function will make horizontal/homogeneous fields
* from Widget_Data have NO further usage as they are controlled by default
* layout function. So calling elm_box_horizontal_set() or
* elm_box_homogenous_set() won't affect layout behavior.
* elm_box_homogeneous_set() won't affect layout behavior.
*
* @param obj The box object
* @param cb The callback function used for layout

2
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -803,7 +803,7 @@ elm_diskselector_add(Evas_Object *parent)
wd->main_box = elm_box_add(parent);
elm_box_horizontal_set(wd->main_box, EINA_TRUE);
elm_box_homogenous_set(wd->main_box, EINA_TRUE);
elm_box_homogeneous_set(wd->main_box, EINA_TRUE);
evas_object_size_hint_weight_set(wd->main_box, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(wd->main_box, EVAS_HINT_FILL,

2
legacy/elementary/src/lib/elm_list.c
View File

@ -1338,7 +1338,7 @@ elm_list_add(Evas_Object *parent)
_elm_config->thumbscroll_bounce_enable);
wd->box = elm_box_add(parent);
elm_box_homogenous_set(wd->box, 1);
elm_box_homogeneous_set(wd->box, 1);
evas_object_size_hint_weight_set(wd->box, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(wd->box, EVAS_HINT_FILL, 0.0);
elm_widget_on_show_region_hook_set(wd->box, _show_region_hook, obj);

30
legacy/elementary/src/lib/elm_table.c
View File

@ -165,35 +165,41 @@ elm_table_add(Evas_Object *parent)
}
/**
* Set the homogenous layout in the table
* Set the homogeneous layout in the table
*
* @param obj The layout object
* @param homogenous A boolean to set (or no) layout homogenous
* @param homogeneous A boolean to set (or no) layout homogeneous
* in the table
* (1 = homogenous, 0 = no homogenous)
* (1 = homogeneous, 0 = no homogeneous)
*
* @ingroup Table
*/
EAPI void
elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
evas_object_table_homogeneous_set(wd->tbl, homogenous);
evas_object_table_homogeneous_set(wd->tbl, homogeneous);
}
EINA_DEPRECATED EAPI void
elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
{
elm_table_homogeneous_set(obj, homogenous);
}
/**
* Get the current table homogenous mode.
* Get the current table homogeneous mode.
*
* @param obj The table object
* @return a boolean to set (or no) layout homogenous in the table
* (1 = homogenous, 0 = no homogenous)
* @return a boolean to set (or no) layout homogeneous in the table
* (1 = homogeneous, 0 = no homogeneous)
*
* @ingroup Table
*/
EAPI Eina_Bool
elm_table_homogenous_get(const Evas_Object *obj)
elm_table_homogeneous_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
@ -201,6 +207,12 @@ elm_table_homogenous_get(const Evas_Object *obj)
return evas_object_table_homogeneous_get(wd->tbl);
}
EINA_DEPRECATED EAPI Eina_Bool
elm_table_homogenous_get(const Evas_Object *obj)
{
return elm_table_homogeneous_get(obj);
}
/**
* Set padding between cells.
*

24
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -1767,26 +1767,32 @@ elm_toolbar_mode_shrink_get(const Evas_Object *obj)
}
/**
* Set the homogenous mode of toolbar @p obj.
* Set the homogeneous mode of toolbar @p obj.
*
* @param obj The toolbar object
* @param homogenous If true, the toolbar items will be uniform in size
* @param homogeneous If true, the toolbar items will be uniform in size
*
* @ingroup Toolbar
*/
EAPI void
elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->homogeneous = !!homogenous;
wd->homogeneous = !!homogeneous;
evas_object_smart_calculate(wd->bx);
}
EINA_DEPRECATED EAPI void
elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
{
elm_toolbar_homogeneous_set(obj, homogenous);
}
/**
* Get the homogenous mode of toolbar @p obj.
* Get the homogeneous mode of toolbar @p obj.
*
* @param obj The toolbar object
* @return If true, the toolbar items are uniform in size
@ -1794,7 +1800,7 @@ elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
* @ingroup Toolbar
*/
EAPI Eina_Bool
elm_toolbar_homogenous_get(const Evas_Object *obj)
elm_toolbar_homogeneous_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
@ -1803,6 +1809,12 @@ elm_toolbar_homogenous_get(const Evas_Object *obj)
return wd->homogeneous;
}
EINA_DEPRECATED EAPI Eina_Bool
elm_toolbar_homogenous_get(const Evas_Object *obj)
{
return elm_toolbar_homogeneous_get(obj);
}
/**
* Set the parent object of the toolbar menu
*