From f886941b112573664598808ab0493e83126ea2bb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Feb 2019 18:19:45 +0100 Subject: [PATCH] api: efl.gfx.size_hints -> efl.gfx.hints Summary: these hints are not strictly size-related, so renaming them is more consistent with their actual function ref T7563 Depends on D7968 Reviewers: segfaultxavi, cedric, bu5hm4n Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7563 Differential Revision: https://phab.enlightenment.org/D7977 --- src/Makefile_Efl.am | 2 +- src/bin/elementary/test_bg.c | 34 +-- src/bin/elementary/test_box.c | 4 +- src/bin/elementary/test_efl_gfx_map.c | 2 +- src/bin/elementary/test_efl_ui_text.c | 20 +- src/bin/elementary/test_evas_map.c | 2 +- src/bin/elementary/test_evas_mask.c | 12 +- src/bin/elementary/test_evas_snapshot.c | 14 +- src/bin/elementary/test_gfx_filters.c | 54 ++--- src/bin/elementary/test_part_bg.c | 12 +- src/bin/elementary/test_part_shadow.c | 8 +- src/bin/elementary/test_photocam.c | 2 +- src/bin/elementary/test_ui_box.c | 196 ++++++++--------- src/bin/elementary/test_ui_clock.c | 26 +-- src/bin/elementary/test_ui_pager.c | 22 +- src/bin/elementary/test_ui_pager_scroll.c | 28 +-- src/bin/elementary/test_ui_panel.c | 10 +- src/bin/elementary/test_ui_panes.c | 6 +- src/bin/elementary/test_ui_popup.c | 22 +- src/bin/elementary/test_ui_progressbar.c | 4 +- src/bin/elementary/test_ui_scroller.c | 32 +-- src/bin/elementary/test_ui_slider.c | 22 +- src/bin/elementary/test_ui_slider_interval.c | 12 +- src/bin/elementary/test_ui_tab_pager.c | 16 +- src/bin/elementary/test_ui_table.c | 202 +++++++++--------- src/bin/elementary/test_ui_textpath.c | 28 +-- src/bin/elementary/test_win_dialog.c | 26 +-- src/bin/elementary/test_win_indicator.c | 8 +- src/bin/elementary/test_win_inline.c | 2 +- .../elementary/button_cxx_example_01.cc | 12 +- .../elementary/efl_ui_grid_example_1.c | 8 +- .../elementary/efl_ui_list_example_1.c | 36 ++-- src/examples/elementary/slider_cxx_example.cc | 2 +- src/examples/evas/evas-hints.c | 2 +- src/lib/edje/edje_calc.c | 8 +- src/lib/efl/Efl.h | 4 +- src/lib/efl/interfaces/efl_gfx_entity.eo | 2 +- .../{efl_gfx_size_hint.eo => efl_gfx_hint.eo} | 40 ++-- src/lib/efl/interfaces/efl_gfx_types.eot | 4 +- src/lib/efl/interfaces/efl_interfaces_main.c | 2 +- src/lib/efl/interfaces/meson.build | 2 +- src/lib/elementary/efl_page_indicator_icon.c | 12 +- src/lib/elementary/efl_ui_box_layout.c | 28 +-- src/lib/elementary/efl_ui_box_stack.c | 6 +- src/lib/elementary/efl_ui_grid.c | 20 +- src/lib/elementary/efl_ui_image.c | 2 +- .../efl_ui_internal_text_scroller.c | 4 +- src/lib/elementary/efl_ui_list.c | 10 +- src/lib/elementary/efl_ui_list_view.c | 2 +- .../efl_ui_list_view_precise_layouter.c | 18 +- src/lib/elementary/efl_ui_panes.c | 12 +- src/lib/elementary/efl_ui_panes_part.eo | 4 +- src/lib/elementary/efl_ui_popup.c | 2 +- .../elementary/efl_ui_scroll_alert_popup.c | 6 +- src/lib/elementary/efl_ui_scroller.c | 10 +- src/lib/elementary/efl_ui_slider.c | 4 +- src/lib/elementary/efl_ui_tab_bar.c | 2 +- src/lib/elementary/efl_ui_tags.c | 42 ++-- src/lib/elementary/efl_ui_text.c | 6 +- src/lib/elementary/efl_ui_text_alert_popup.c | 6 +- src/lib/elementary/efl_ui_textpath.c | 6 +- src/lib/elementary/efl_ui_win.c | 48 ++--- src/lib/elementary/efl_ui_win.eo | 6 +- src/lib/elementary/elc_multibuttonentry.c | 4 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/evas/Evas_Common.h | 12 +- src/lib/evas/Evas_Internal.h | 2 +- src/lib/evas/Evas_Legacy.h | 20 +- src/lib/evas/canvas/efl_canvas_object.eo | 20 +- src/lib/evas/canvas/evas_object_main.c | 74 +++---- src/lib/evas/canvas/evas_object_table.c | 2 +- src/lib/evas/canvas/evas_render.c | 2 +- src/scripts/pyolian/test_eolian.py | 8 +- src/tests/edje/edje_test_text.c | 10 +- src/tests/elementary/efl_ui_test_box.c | 80 +++---- 75 files changed, 721 insertions(+), 721 deletions(-) rename src/lib/efl/interfaces/{efl_gfx_size_hint.eo => efl_gfx_hint.eo} (87%) diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index b364beeab4..351ff73fef 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -47,7 +47,7 @@ efl_eolian_files = \ lib/efl/interfaces/efl_gfx_gradient_radial.eo \ lib/efl/interfaces/efl_gfx_filter.eo \ lib/efl/interfaces/efl_gfx_blur.eo \ - lib/efl/interfaces/efl_gfx_size_hint.eo \ + lib/efl/interfaces/efl_gfx_hint.eo \ lib/efl/interfaces/efl_model.eo \ lib/efl/interfaces/efl_animator.eo \ lib/efl/interfaces/efl_orientation.eo \ diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index 1802a69f79..338084b31a 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c @@ -337,7 +337,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event box = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_weight_set(efl_added, 1, 1), efl_content_set(win, efl_added)); cs = elm_colorselector_add(win); @@ -354,16 +354,16 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); efl_add(EFL_UI_IMAGE_CLASS, win, efl_file_set(efl_added, buf, NULL), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), + efl_gfx_hint_align_set(efl_added, 0.5, 0.5), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win), efl_pack(box, efl_added)); snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); efl_add(EFL_UI_IMAGE_CLASS, win, efl_file_set(efl_added, buf, NULL), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), + efl_gfx_hint_align_set(efl_added, 0.5, 0.5), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), efl_pack(box, efl_added)); @@ -409,32 +409,32 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_ui_win_alpha_set(efl_added, EINA_FALSE)); efl_add(EFL_UI_BG_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), efl_content_set(win, efl_added)); box = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), efl_content_set(win, efl_added)); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); o_bg = efl_add(EFL_UI_BG_CLASS, box, efl_file_set(efl_added, buf, NULL), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_pack(box, efl_added)); hbox = efl_add(EFL_UI_BOX_CLASS, box, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_pack(box, efl_added)); rdg = rd = efl_add(EFL_UI_RADIO_CLASS, hbox, efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FILL), efl_text_set(efl_added, "Fill"), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), efl_pack(hbox, efl_added)); @@ -442,7 +442,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE), efl_ui_radio_group_add(efl_added, rdg), efl_text_set(efl_added, "Fit Inside"), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), efl_pack(hbox, efl_added)); @@ -451,7 +451,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE), efl_ui_radio_group_add(efl_added, rdg), efl_text_set(efl_added, "Fit Outside"), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), efl_pack(hbox, efl_added)); @@ -459,7 +459,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_NONE), efl_ui_radio_group_add(efl_added, rdg), efl_text_set(efl_added, "None"), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), efl_pack(hbox, efl_added)); @@ -467,7 +467,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_TILE), efl_ui_radio_group_add(efl_added, rdg), efl_text_set(efl_added, "Tile"), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), efl_pack(hbox, efl_added)); @@ -475,7 +475,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_add(EFL_UI_CHECK_CLASS, hbox, efl_text_set(efl_added, "Bg Color"), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), + efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg), efl_pack(hbox, efl_added)); diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c index f50dcb339f..31ccc9cbb0 100644 --- a/src/bin/elementary/test_box.c +++ b/src/bin/elementary/test_box.c @@ -909,13 +909,13 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* rectangle with a max size */ o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, efl_gfx_color_set(efl_added, 64, 128, 64, 255), - efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(128, 20))); + efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(128, 20))); efl_pack(bx, o); /* image with a forced min size */ snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); o = efl_add(EFL_UI_IMAGE_CLASS, win, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_file_set(efl_added, buf, NULL)); efl_pack(bx, o); diff --git a/src/bin/elementary/test_efl_gfx_map.c b/src/bin/elementary/test_efl_gfx_map.c index 72d7db139d..62165d42fc 100644 --- a/src/bin/elementary/test_efl_gfx_map.c +++ b/src/bin/elementary/test_efl_gfx_map.c @@ -52,7 +52,7 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* image with a min size */ snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); img = efl_add(EFL_UI_IMAGE_CLASS, win, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_file_set(efl_added, buf, NULL)); efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c index 1ef0873935..9cc2a322f4 100644 --- a/src/bin/elementary/test_efl_ui_text.c +++ b/src/bin/elementary/test_efl_ui_text.c @@ -150,7 +150,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_ui_win_autodel_set(efl_added, EINA_TRUE)); bx = efl_add(EFL_UI_BOX_CLASS, win); - efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); + efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); efl_content_set(win, bx); en = efl_add(EFL_UI_TEXT_CLASS, bx, @@ -174,24 +174,24 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve "occaecat cupidatat non proident, sunt in culpa qui officia deserunt\n" "mollit anim id est laborum"); - efl_gfx_size_hint_min_set(en, EINA_SIZE2D(300, 100)); + efl_gfx_hint_size_min_set(en, EINA_SIZE2D(300, 100)); efl_pack(bx, en); bx2 = efl_add(EFL_UI_BOX_CLASS, bx); - efl_gfx_size_hint_weight_set(bx2, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); + efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Sel"); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en); - efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); + efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Wr"); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en); - efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); + efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); @@ -209,7 +209,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED efl_ui_win_autodel_set(efl_added, EINA_TRUE)); bx = efl_add(EFL_UI_BOX_CLASS, win); - efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); + efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); efl_content_set(win, bx); en = efl_add(EFL_UI_TEXT_CLASS, bx, @@ -370,27 +370,27 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_object_focus_set(en, EINA_TRUE); bx2 = efl_add(EFL_UI_BOX_CLASS, bx); - efl_gfx_size_hint_weight_set(bx2, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); + efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Image"); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en); - efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); + efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Emoticon"); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); - efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); + efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Factory"); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); - efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); + efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c index 7e25aafba7..b598044c7d 100644 --- a/src/bin/elementary/test_evas_map.c +++ b/src/bin/elementary/test_evas_map.c @@ -60,7 +60,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* image with a min size */ snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); img = efl_add(EFL_UI_IMAGE_CLASS, win, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_file_set(efl_added, buf, NULL)); efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c index 7ce8933806..6c3162feb4 100644 --- a/src/bin/elementary/test_evas_mask.c +++ b/src/bin/elementary/test_evas_mask.c @@ -129,8 +129,8 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event // FIXME: No genlist in EO API o = gl = elm_genlist_add(win); elm_genlist_homogeneous_set(gl, 1); - efl_gfx_size_hint_align_set(o, -1, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, -1, -1); + efl_gfx_hint_weight_set(o, 1, 1); itc = elm_genlist_item_class_new(); itc->item_style = "default"; @@ -154,26 +154,26 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event box2 = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added)); // FIXME: button EO API efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Toggle mask"), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), - efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_pack(box2, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Toggle map"), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), - efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_pack(box2, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Rotate Window"), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), - efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_pack(box2, efl_added)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600)); diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c index 96b7bc4478..4988702bdb 100644 --- a/src/bin/elementary/test_evas_snapshot.c +++ b/src/bin/elementary/test_evas_snapshot.c @@ -30,7 +30,7 @@ _image_create(Eo *win, const char *path) { return efl_add(EFL_UI_IMAGE_CLASS, win, efl_file_set(efl_added, path, NULL), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(20, 20))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(20, 20))); } static void @@ -169,36 +169,36 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e elm_slider_min_max_set(efl_added, 0, 64), elm_slider_value_set(efl_added, 5), elm_slider_unit_format_set(efl_added, "%.0f px"), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); box = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Toggle animation"), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Save to file"), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Map"), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Close"), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win)); diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index 58fd21c4a5..951b98a73e 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -248,7 +248,7 @@ _text_resize(void *data EINA_UNUSED, const Efl_Event *ev) Eina_Size2D sz; sz = efl_gfx_entity_size_get(ev->object); - efl_gfx_size_hint_min_set(ev->object, sz); + efl_gfx_hint_size_min_set(ev->object, sz); } static void @@ -258,7 +258,7 @@ _textblock_resize(void *data EINA_UNUSED, const Efl_Event *ev) evas_object_textblock_size_native_get(ev->object, &w, &h); evas_object_textblock_style_insets_get(ev->object, &l, &r, &t, &b); - efl_gfx_size_hint_min_set(ev->object, EINA_SIZE2D(w + l + r, h + t + b)); + efl_gfx_hint_size_min_set(ev->object, EINA_SIZE2D(w + l + r, h + t + b)); } static void @@ -345,28 +345,28 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve { box2 = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_align_set(efl_added, 0.5, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); efl_pack(box, box2); /* FIXME: Efl.Ui.Text doesn't work as expected. */ o = efl_add(EFL_UI_TEXT_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), - efl_gfx_size_hint_align_set(efl_added, 1.0, 0.5)); + efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), + efl_gfx_hint_align_set(efl_added, 1.0, 0.5)); efl_text_set(o, "Filter:"); efl_pack(box2, o); o = spinner = elm_spinner_add(win); - efl_gfx_size_hint_weight_set(o, 1.0, 1.0); - efl_gfx_size_hint_align_set(o, -1.0, 0.5); + efl_gfx_hint_weight_set(o, 1.0, 1.0); + efl_gfx_hint_align_set(o, -1.0, 0.5); _spinner_fill(o); efl_pack(box2, o); evas_object_show(o); o = elm_spinner_add(win); - efl_gfx_size_hint_weight_set(o, 0.0, 1.0); - efl_gfx_size_hint_align_set(o, -1.0, 0.5); + efl_gfx_hint_weight_set(o, 0.0, 1.0); + efl_gfx_hint_align_set(o, -1.0, 0.5); elm_spinner_min_max_set(o, 6, 120); elm_spinner_value_set(o, default_font_size); efl_event_callback_add(o, ELM_SPINNER_EVENT_DELAY_CHANGED, _font_size_change, win); @@ -375,8 +375,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve o = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Flip"), - efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win)); efl_pack(box2, o); } @@ -384,10 +384,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve { box2 = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_pack_padding_set(efl_added, 5, 5, 1), - efl_gfx_size_hint_margin_set(efl_added, 5, 5, 5, 5), + efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5), efl_pack_align_set(efl_added, 0, 0.5)); efl_pack(box, box2); @@ -399,10 +399,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve if (!images[k].path) break; snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), images[k].path); o = efl_add(EFL_UI_IMAGE_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), - efl_gfx_size_hint_max_set(efl_added, size), - efl_gfx_size_hint_min_set(efl_added, size), + efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), + efl_gfx_hint_align_set(efl_added, 0.5, 0.5), + efl_gfx_hint_size_max_set(efl_added, size), + efl_gfx_hint_size_min_set(efl_added, size), efl_file_set(efl_added, buf, NULL), efl_name_set(efl_added, images[k].src_name), elm_object_tooltip_text_set(efl_added, images[k].src_name)); @@ -429,10 +429,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve }; o = elm_colorselector_add(win); - efl_gfx_size_hint_weight_set(o, 1.0, 0); - efl_gfx_size_hint_align_set(o, -1.0, 0); + efl_gfx_hint_weight_set(o, 1.0, 0); + efl_gfx_hint_align_set(o, -1.0, 0); elm_colorselector_mode_set(o, ELM_COLORSELECTOR_PALETTE); - efl_gfx_size_hint_max_set(o, maxsz); + efl_gfx_hint_size_max_set(o, maxsz); efl_name_set(o, "myColor"); elm_object_tooltip_text_set(o, "Pick a color to use as variable 'myColor'"); evas_object_smart_callback_add(o, "changed", _colsel_cb, win); @@ -453,8 +453,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_pack_align_set(efl_added, 0.5, 0.5)); efl_pack(flip, box2); @@ -469,8 +469,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_pack_align_set(efl_added, 0.5, 0.5)); efl_pack(flip, box2); diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c index 60a83a8c8a..37e39da2c6 100644 --- a/src/bin/elementary/test_part_bg.c +++ b/src/bin/elementary/test_part_bg.c @@ -63,12 +63,12 @@ _create_box_contents(Evas_Object *box) hbox = efl_add(EFL_UI_BOX_CLASS, box, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_weight_set(efl_added, 1, 1), efl_pack_end(box, efl_added)); radio_group = radio = efl_add(EFL_UI_RADIO_CLASS, hbox, efl_pack_end(hbox, efl_added), - efl_gfx_size_hint_weight_set(efl_added, 0, 0), + efl_gfx_hint_weight_set(efl_added, 0, 0), efl_ui_radio_state_value_set(efl_added, 0)); content = efl_add(EFL_UI_BOX_CLASS, hbox, @@ -92,7 +92,7 @@ _create_box_contents(Evas_Object *box) efl_ui_radio_group_add(efl_added, radio_group), efl_pack_end(hbox, efl_added), efl_ui_radio_state_value_set(efl_added, i + 1), - efl_gfx_size_hint_weight_set(efl_added, 0, 0)); + efl_gfx_hint_weight_set(efl_added, 0, 0)); content = efl_add(content_class[i], hbox, efl_pack_end(hbox, efl_added)); @@ -147,12 +147,12 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_ui_win_autodel_set(efl_added, EINA_TRUE)); vbox = efl_add(EFL_UI_BOX_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_weight_set(efl_added, 1, 1), efl_content_set(win, efl_added)); hbox = efl_add(EFL_UI_BOX_CLASS, vbox, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), + efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack_end(vbox, efl_added)); reset_btn = efl_add(EFL_UI_BUTTON_CLASS, hbox, @@ -172,7 +172,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_pack_end(vbox, scr); vbox = efl_add(EFL_UI_BOX_CLASS, scr, - efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_weight_set(efl_added, 1, 1), efl_content_set(scr, efl_added)); radio_group = _create_box_contents(vbox); diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c index 2df5f6766b..39d170b03c 100644 --- a/src/bin/elementary/test_part_shadow.c +++ b/src/bin/elementary/test_part_shadow.c @@ -94,7 +94,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_content_set(win, bx); pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); - efl_gfx_size_hint_weight_set(pb, EFL_GFX_SIZE_HINT_EXPAND, 0); + efl_gfx_hint_weight_set(pb, EFL_GFX_HINT_EXPAND, 0); efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); efl_pack(bx, pb); td->pb1 = pb; @@ -122,7 +122,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); - efl_gfx_size_hint_weight_set(pb, EFL_GFX_SIZE_HINT_EXPAND, 0); + efl_gfx_hint_weight_set(pb, EFL_GFX_HINT_EXPAND, 0); efl_pack(bx, pb); td->pb4 = pb; @@ -143,7 +143,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve hbx = efl_add(EFL_UI_BOX_CLASS, win); efl_ui_direction_set(hbx, EFL_UI_DIR_HORIZONTAL); - efl_gfx_size_hint_weight_set(hbx, EFL_GFX_SIZE_HINT_EXPAND, 0); + efl_gfx_hint_weight_set(hbx, EFL_GFX_HINT_EXPAND, 0); efl_pack(bx, hbx); // FIXME: Needs wheel progressbar class @@ -176,7 +176,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve bt_bx = efl_add(EFL_UI_BOX_CLASS, win); efl_ui_direction_set(bt_bx, EFL_UI_DIR_HORIZONTAL); - efl_gfx_size_hint_weight_set(bt_bx, EFL_GFX_SIZE_HINT_EXPAND, 0); + efl_gfx_hint_weight_set(bt_bx, EFL_GFX_HINT_EXPAND, 0); efl_pack(bx, bt_bx); bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index 9c54b01207..79f6799020 100644 --- a/src/bin/elementary/test_photocam.c +++ b/src/bin/elementary/test_photocam.c @@ -816,7 +816,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE efl_add(EFL_UI_TEXT_CLASS, bx, efl_text_set(efl_added, "Clicking the image will play/pause animation."), efl_text_interactive_editable_set(efl_added, EINA_FALSE), - efl_gfx_size_hint_weight_set(efl_added, 1, 0), + efl_gfx_hint_weight_set(efl_added, 1, 0), efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"), efl_pack(bx, efl_added) ); diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index 58194a4099..d3cfc1c412 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c @@ -26,36 +26,36 @@ weights_cb(void *data, const Efl_Event *event) switch (mode) { case NONE: - efl_gfx_size_hint_align_set(data, 0.5, 0.5); + efl_gfx_hint_align_set(data, 0.5, 0.5); for (int i = 0; i < CNT; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[i], 0, 0); break; case NONE_BUT_FILL: - efl_gfx_size_hint_align_set(data, -1, -1); + efl_gfx_hint_align_set(data, -1, -1); for (int i = 0; i < CNT; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[i], 0, 0); break; case EQUAL: - efl_gfx_size_hint_align_set(data, 0.5, 0.5); + efl_gfx_hint_align_set(data, 0.5, 0.5); for (int i = 0; i < CNT; i++) - efl_gfx_size_hint_weight_set(objects[i], 1, 1); + efl_gfx_hint_weight_set(objects[i], 1, 1); break; case ONE: - efl_gfx_size_hint_align_set(data, 0.5, 0.5); + efl_gfx_hint_align_set(data, 0.5, 0.5); for (int i = 0; i < 6; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); - efl_gfx_size_hint_weight_set(objects[6], 1, 1); + efl_gfx_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[6], 1, 1); for (int i = 7; i < CNT; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[i], 0, 0); break; case TWO: - efl_gfx_size_hint_align_set(data, 0.5, 0.5); + efl_gfx_hint_align_set(data, 0.5, 0.5); for (int i = 0; i < 5; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); - efl_gfx_size_hint_weight_set(objects[5], 1, 1); - efl_gfx_size_hint_weight_set(objects[6], 1, 1); + efl_gfx_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[5], 1, 1); + efl_gfx_hint_weight_set(objects[6], 1, 1); for (int i = 7; i < CNT; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[i], 0, 0); break; } } @@ -65,7 +65,7 @@ user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) { int val = elm_slider_value_get(event->object); - efl_gfx_size_hint_min_set(objects[3], EINA_SIZE2D(val, val)); + efl_gfx_hint_size_min_set(objects[3], EINA_SIZE2D(val, val)); } static void @@ -85,7 +85,7 @@ margin_slider_cb(void *data, const Efl_Event *event) Eo *win = data, *box; box = efl_key_wref_get(win, "box"); - efl_gfx_size_hint_margin_set(box, val, val, val, val); + efl_gfx_hint_margin_set(box, val, val, val, val); } static void @@ -120,8 +120,8 @@ alignh_btn_slider_cb(void *data, const Efl_Event *event) btn = efl_key_wref_get(win, "button"); val = elm_slider_value_get(event->object); - efl_gfx_size_hint_align_get(btn, NULL, &av); - efl_gfx_size_hint_align_set(btn, val, av); + efl_gfx_hint_align_get(btn, NULL, &av); + efl_gfx_hint_align_set(btn, val, av); } static void @@ -132,8 +132,8 @@ alignv_btn_slider_cb(void *data, const Efl_Event *event) btn = efl_key_wref_get(win, "button"); val = elm_slider_value_get(event->object); - efl_gfx_size_hint_align_get(btn, &ah, NULL); - efl_gfx_size_hint_align_set(btn, ah, val); + efl_gfx_hint_align_get(btn, &ah, NULL); + efl_gfx_hint_align_set(btn, ah, val); } static void @@ -209,7 +209,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED) r.x = (rp.w / count) * i; r.y = (rp.h / count) * i; - r.size = efl_gfx_size_hint_combined_min_get(sobj); + r.size = efl_gfx_hint_size_combined_min_get(sobj); efl_gfx_entity_geometry_set(sobj, r); i++; } @@ -248,15 +248,15 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in vbox = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); - efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); + efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); elm_win_resize_object_add(win, vbox); /* controls */ f = elm_frame_add(win); elm_object_text_set(f, "Controls"); - efl_gfx_size_hint_align_set(f, -1, -1); - efl_gfx_size_hint_weight_set(f, 1, 0); + efl_gfx_hint_align_set(f, -1, -1); + efl_gfx_hint_weight_set(f, 1, 0); efl_pack(vbox, f); efl_gfx_entity_visible_set(f, 1); @@ -269,14 +269,14 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* weights radio group */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); efl_pack(hbox, bx); chk = o = elm_radio_add(win); elm_object_text_set(o, "No weight"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -284,7 +284,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "No weight + box fill"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE_BUT_FILL); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -293,7 +293,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "Equal weights"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, EQUAL); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -302,7 +302,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "One weight only"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, ONE); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -311,7 +311,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "Two weights"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, TWO); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -323,9 +323,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* misc */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -337,7 +337,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_check_selected_set(o, 0); elm_object_text_set(o, "Flow"); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0); + efl_gfx_hint_align_set(o, 0, 0); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -345,7 +345,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_check_selected_set(o, 1); elm_object_text_set(o, "Horizontal"); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0); + efl_gfx_hint_align_set(o, 0, 0); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -353,7 +353,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_check_selected_set(o, 0); elm_object_text_set(o, "Homogenous"); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0); + efl_gfx_hint_align_set(o, 0, 0); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -361,7 +361,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_check_selected_set(o, 0); elm_object_text_set(o, "Homogenous + Max"); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0); + efl_gfx_hint_align_set(o, 0, 0); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -369,8 +369,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_check_selected_set(o, 0); elm_object_text_set(o, "Custom layout"); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, win); - efl_gfx_size_hint_align_set(o, 0, 0); - efl_gfx_size_hint_weight_set(o, 0, 1); + efl_gfx_hint_align_set(o, 0, 0); + efl_gfx_hint_weight_set(o, 0, 1); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -378,9 +378,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* user min size setter */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -392,8 +392,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); elm_slider_min_max_set(o, 0, 250); elm_slider_inverted_set(o, 1); @@ -405,9 +405,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* inner box padding */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -419,8 +419,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win); elm_slider_min_max_set(o, 0, 40); elm_slider_inverted_set(o, 1); @@ -432,9 +432,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* outer margin */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -446,8 +446,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win); elm_slider_min_max_set(o, 0, 40); elm_slider_inverted_set(o, 1); @@ -459,9 +459,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* Box align */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -473,8 +473,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win); elm_slider_min_max_set(o, -0.1, 1.0); elm_slider_step_set(o, 0.1); @@ -486,9 +486,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 1); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 0); - efl_gfx_size_hint_min_set(o, EINA_SIZE2D(100, 0)); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 0); + efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0)); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win); elm_slider_min_max_set(o, -0.1, 1.0); elm_slider_step_set(o, 0.1); @@ -499,9 +499,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* Button align */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -513,8 +513,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_btn_slider_cb, win); elm_slider_min_max_set(o, 0.0, 1.0); elm_slider_step_set(o, 0.1); @@ -526,9 +526,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 1); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 0); - efl_gfx_size_hint_min_set(o, EINA_SIZE2D(100, 0)); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 0); + efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0)); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_btn_slider_cb, win); elm_slider_min_max_set(o, -0.1, 1.0); elm_slider_step_set(o, 0.1); @@ -540,8 +540,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* contents */ f = elm_frame_add(win); elm_object_text_set(f, "Contents"); - efl_gfx_size_hint_align_set(f, -1, -1); - efl_gfx_size_hint_weight_set(f, 1, 1); + efl_gfx_hint_align_set(f, -1, -1); + efl_gfx_hint_weight_set(f, 1, 1); efl_pack(vbox, f); efl_gfx_entity_visible_set(f, 1); @@ -549,82 +549,82 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_key_wref_set(win, "box", bx); efl_pack_padding_set(bx, 10, 10, EINA_TRUE); - efl_gfx_size_hint_align_set(bx, 0.5, 0.5); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0.5, 0.5); + efl_gfx_hint_weight_set(bx, 1, 1); efl_content_set(f, bx); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "Btn1"); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_align_set(o, 0.5, 0.5); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_align_set(o, 0.5, 0.5); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "Button 2"); - efl_gfx_size_hint_weight_set(o, 0, 0); + efl_gfx_hint_weight_set(o, 0, 0); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = elm_label_add(win); elm_label_line_wrap_set(o, ELM_WRAP_WORD); elm_object_text_set(o, "This label is not marked as fill"); - efl_gfx_size_hint_align_set(o, 0.5, 0.5); + efl_gfx_hint_align_set(o, 0.5, 0.5); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "Min size"); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_gfx_size_hint_align_set(o, 0.5, 1.0); - efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_align_set(o, 0.5, 1.0); + efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "Quit!"); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_gfx_size_hint_align_set(o, 0.5, 0.0); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_align_set(o, 0.5, 0.0); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = elm_label_add(win); elm_label_line_wrap_set(o, ELM_WRAP_WORD); elm_object_text_set(o, "This label on the other hand
is marked as align=fill."); - efl_gfx_size_hint_align_set(o, -1, -1); + efl_gfx_hint_align_set(o, -1, -1); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_key_wref_set(win, "button", o); efl_text_set(o, "Button with a quite long text."); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100)); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_size_max_set(o, EINA_SIZE2D(200, 100)); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "BtnA"); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "BtnB"); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); efl_text_set(o, "BtnC"); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c index fc20112c04..4a0fa1182b 100644 --- a/src/bin/elementary/test_ui_clock.c +++ b/src/bin/elementary/test_ui_clock.c @@ -54,11 +54,11 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_content_set(win, efl_added), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(360, 240))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240))); dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), @@ -69,8 +69,8 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ efl_pack(bx, efl_added)); dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), @@ -80,21 +80,21 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_object_disabled_set(dt2, EINA_TRUE); dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_pack(bx, efl_added)); efl_add(EFL_UI_TEXT_CLASS, bx, efl_text_set(efl_added, "Editable Clock:"), - efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), - efl_gfx_size_hint_align_set(efl_added, 0, 0.5), - efl_gfx_size_hint_fill_set(efl_added, EINA_FALSE, EINA_TRUE), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 25)), + efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), + efl_gfx_hint_align_set(efl_added, 0, 0.5), + efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_TRUE), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)), efl_pack(bx, efl_added)); dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), efl_ui_clock_pause_set(efl_added, EINA_TRUE), efl_pack(bx, efl_added)); diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c index f864a430c4..e8d602f8d5 100644 --- a/src/bin/elementary/test_ui_pager.c +++ b/src/bin/elementary/test_ui_pager.c @@ -80,7 +80,7 @@ static Eo *page_add(Page_Type p, Eo *parent) page = efl_add(EFL_UI_LAYOUT_CLASS, parent, efl_file_set(efl_added, buf, "page"), efl_text_set(efl_part(efl_added, "text"), "Layout Page")); - efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; case LIST: page = elm_list_add(parent); @@ -98,7 +98,7 @@ static Eo *page_add(Page_Type p, Eo *parent) case BUTTON: page = efl_add(EFL_UI_BUTTON_CLASS, parent, efl_text_set(efl_added, "Button Page")); - efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; default: snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", @@ -106,7 +106,7 @@ static Eo *page_add(Page_Type p, Eo *parent) page = efl_add(EFL_UI_LAYOUT_CLASS, parent, efl_file_set(efl_added, buf, "page"), efl_text_set(efl_part(efl_added, "text"), "Layout Page")); - efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; } @@ -339,8 +339,8 @@ static void page_size_cb(void *data, // Width fr = elm_frame_add(box); elm_object_text_set(fr, "Width"); - efl_gfx_size_hint_align_set(fr, -1, -1); - efl_gfx_size_hint_weight_set(fr, 1, 1); + efl_gfx_hint_align_set(fr, -1, -1); + efl_gfx_hint_weight_set(fr, 1, 1); efl_pack(box, fr); efl_gfx_entity_visible_set(fr, 1); @@ -355,7 +355,7 @@ static void page_size_cb(void *data, sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, efl_ui_range_min_max_set(efl_added, 100, 200), efl_ui_range_value_set(efl_added, params->w), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, width_slider_cb, params), efl_pack_end(inbox, efl_added)); @@ -380,8 +380,8 @@ static void page_size_cb(void *data, // Height fr = elm_frame_add(box); elm_object_text_set(fr, "Height"); - efl_gfx_size_hint_align_set(fr, -1, -1); - efl_gfx_size_hint_weight_set(fr, 1, 1); + efl_gfx_hint_align_set(fr, -1, -1); + efl_gfx_hint_weight_set(fr, 1, 1); efl_pack(box, fr); efl_gfx_entity_visible_set(fr, 1); @@ -396,7 +396,7 @@ static void page_size_cb(void *data, sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, efl_ui_range_min_max_set(efl_added, 100, 300), efl_ui_range_value_set(efl_added, params->h), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, height_slider_cb, params), efl_pack_end(inbox, efl_added)); @@ -610,7 +610,7 @@ static void current_page_cb(void *data, efl_pack_end(box, efl_added)); sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, - efl_gfx_size_hint_align_set(efl_added, -1, -1), + efl_gfx_hint_align_set(efl_added, -1, -1), efl_pack_end(box, efl_added)); if (efl_content_count(pager) > 0) @@ -679,7 +679,7 @@ void test_ui_pager(void *data EINA_UNUSED, efl_ui_win_autodel_set(efl_added, EINA_TRUE)); panes = efl_add(EFL_UI_PANES_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_weight_set(efl_added, 1, 1), efl_ui_panes_split_ratio_set(efl_added, 0.3), efl_content_set(win, efl_added)); diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c index 99a6fc9146..9941304491 100644 --- a/src/bin/elementary/test_ui_pager_scroll.c +++ b/src/bin/elementary/test_ui_pager_scroll.c @@ -85,7 +85,7 @@ static Eo *page_add(Page_Type p, Eo *parent) page = efl_add(EFL_UI_LAYOUT_CLASS, parent, efl_file_set(efl_added, buf, "page"), efl_text_set(efl_part(efl_added, "text"), "Layout Page")); - efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; case LIST: page = elm_list_add(parent); @@ -103,7 +103,7 @@ static Eo *page_add(Page_Type p, Eo *parent) case BUTTON: page = efl_add(EFL_UI_BUTTON_CLASS, parent, efl_text_set(efl_added, "Button Page")); - efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; default: snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", @@ -111,7 +111,7 @@ static Eo *page_add(Page_Type p, Eo *parent) page = efl_add(EFL_UI_LAYOUT_CLASS, parent, efl_file_set(efl_added, buf, "page"), efl_text_set(efl_part(efl_added, "text"), "Layout Page")); - efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; } @@ -395,8 +395,8 @@ static void page_size_cb(void *data, // Width fr = elm_frame_add(box); elm_object_text_set(fr, "Width"); - efl_gfx_size_hint_align_set(fr, -1, -1); - efl_gfx_size_hint_weight_set(fr, 1, 1); + efl_gfx_hint_align_set(fr, -1, -1); + efl_gfx_hint_weight_set(fr, 1, 1); efl_pack(box, fr); efl_gfx_entity_visible_set(fr, 1); @@ -411,7 +411,7 @@ static void page_size_cb(void *data, sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, efl_ui_range_min_max_set(efl_added, 100, 200), efl_ui_range_value_set(efl_added, params->w), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, width_slider_cb, params), efl_pack_end(inbox, efl_added)); @@ -436,8 +436,8 @@ static void page_size_cb(void *data, // Height fr = elm_frame_add(box); elm_object_text_set(fr, "Height"); - efl_gfx_size_hint_align_set(fr, -1, -1); - efl_gfx_size_hint_weight_set(fr, 1, 1); + efl_gfx_hint_align_set(fr, -1, -1); + efl_gfx_hint_weight_set(fr, 1, 1); efl_pack(box, fr); efl_gfx_entity_visible_set(fr, 1); @@ -452,7 +452,7 @@ static void page_size_cb(void *data, sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, efl_ui_range_min_max_set(efl_added, 100, 300), efl_ui_range_value_set(efl_added, params->h), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, height_slider_cb, params), efl_pack_end(inbox, efl_added)); @@ -496,7 +496,7 @@ static void padding_cb(void *data, efl_add(EFL_UI_SLIDER_CLASS, box, efl_ui_range_min_max_set(efl_added, 0, 50), efl_ui_range_value_set(efl_added, params->padding), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, params), efl_pack_end(box, efl_added)); @@ -526,8 +526,8 @@ static void side_page_num_cb(void *data, efl_ui_range_min_max_set(efl_added, 0, 3), efl_ui_range_value_set(efl_added, params->side_page_num), efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), - efl_gfx_size_hint_weight_set(efl_added, 1, 1), - efl_gfx_size_hint_align_set(efl_added, -1, -1), + efl_gfx_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_align_set(efl_added, -1, -1), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, side_page_num_slider_cb, params), efl_pack_end(box, efl_added)); @@ -724,7 +724,7 @@ static void current_page_cb(void *data, efl_pack_end(box, efl_added)); sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, - efl_gfx_size_hint_align_set(efl_added, -1, -1), + efl_gfx_hint_align_set(efl_added, -1, -1), efl_pack_end(box, efl_added)); if (efl_content_count(pager) > 0) @@ -860,7 +860,7 @@ void test_ui_pager_scroll(void *data EINA_UNUSED, efl_ui_win_autodel_set(efl_added, EINA_TRUE)); panes = efl_add(EFL_UI_PANES_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_gfx_hint_weight_set(efl_added, 1, 1), efl_ui_panes_split_ratio_set(efl_added, 0.3), efl_content_set(win, efl_added)); diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c index eed8d14759..40ca680c0f 100644 --- a/src/bin/elementary/test_ui_panel.c +++ b/src/bin/elementary/test_ui_panel.c @@ -20,8 +20,8 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); efl_add(EFL_UI_IMAGE_CLASS, table, efl_file_set(efl_added, buf, NULL), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), efl_pack_table(table, efl_added, 0, 0, 4, 5)); // Top Panel @@ -114,17 +114,17 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_ui_check_selected_set(efl_added, elm_config_scroll_thumbscroll_enabled_get()), efl_text_set(efl_added, "Enable thumb scroll (temporarily"), efl_event_callback_add(efl_added, EFL_UI_NSTATE_EVENT_CHANGED, _check_changed, NULL), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), efl_pack(box, efl_added)); check = efl_add(EFL_UI_CHECK_CLASS, box, efl_text_set(efl_added, "Reset content on toggle"), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), efl_pack(box, efl_added)); btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "toggle"), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), efl_pack(box, efl_added)); table = efl_add(EFL_UI_TABLE_CLASS, box, diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c index 4e6d3373e0..3dcf010929 100644 --- a/src/bin/elementary/test_ui_panes.c +++ b/src/bin/elementary/test_ui_panes.c @@ -21,7 +21,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Left - user set min size(110,110)"), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(110, 110)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(110, 110)), efl_content_set(efl_part(panes, "first"), efl_added) ); @@ -31,14 +31,14 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e ); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Up - user set min size(10,0)"), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(10, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(10, 0)), efl_content_set(efl_part(panes_h, "first"), efl_added) ); efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Down - min size 50 40"), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(50, 40)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(50, 40)), efl_content_set(efl_part(panes_h, "second"), efl_added) ); diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c index 3f59a4a28f..311ec1d715 100644 --- a/src/bin/elementary/test_ui_popup.c +++ b/src/bin/elementary/test_ui_popup.c @@ -1009,7 +1009,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_anchor_popup_layout"); - efl_gfx_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_content_set(win, layout); Eo *efl_ui_popup = efl_add(EFL_UI_ANCHOR_POPUP_CLASS, win); @@ -1034,7 +1034,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void { btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(btn, "anchor"); - efl_gfx_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); snprintf(buf, sizeof(buf), "anchor%d", i+1); @@ -1043,52 +1043,52 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(btn, "anchor none"); - efl_gfx_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); efl_content_set(efl_part(layout, "anchor_none"), btn); Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); - efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Center Align"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); efl_pack_table(table, btn, 0, 0, 2, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Top Align"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); efl_pack_table(table, btn, 2, 0, 2, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Bottom Align"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); efl_pack_table(table, btn, 4, 0, 2, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Left Align"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); efl_pack_table(table, btn, 0, 1, 3, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Right Align"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); efl_pack_table(table, btn, 3, 1, 3, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Position Set"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); efl_pack_table(table, btn, 0, 2, 3, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Resize"); - efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); + efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data); efl_pack_table(table, btn, 3, 2, 3, 1); diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c index 09a0e704c0..cbb2fdc95a 100644 --- a/src/bin/elementary/test_ui_progressbar.c +++ b/src/bin/elementary/test_ui_progressbar.c @@ -133,7 +133,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf efl_pack(bx, efl_added), efl_text_set(efl_added, "percent"), efl_ui_range_min_max_set(efl_added, 0, 100), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20)) + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)) ); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); @@ -146,7 +146,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf efl_pack(bx, efl_added), efl_text_set(efl_added, "10-100"), efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)), efl_ui_range_min_max_set(efl_added, 10, 100), efl_ui_range_value_set(efl_added, 10) ); diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c index 2cbceb77f3..3a43a43902 100644 --- a/src/bin/elementary/test_ui_scroller.c +++ b/src/bin/elementary/test_ui_scroller.c @@ -37,28 +37,28 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); sc = efl_add(EFL_UI_SCROLLER_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), efl_content_set(win, efl_added)); bx = efl_add(EFL_UI_BOX_CLASS, sc, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), + efl_gfx_hint_align_set(efl_added, 0.5, 0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_content_set(sc, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), efl_pack(bx, efl_added)); for (i = 0; i < 3; i++) { efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Vertical"), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } @@ -83,25 +83,25 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void { efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Vertical"), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } gd = efl_add(EFL_UI_TABLE_CLASS, bx, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_align_set(efl_added, 0.5, 0), efl_pack(bx, efl_added)); efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, efl_gfx_color_set(efl_added, 0, 0, 0, 0), - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(200, 120)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(200, 120)), efl_pack_table(gd, efl_added, 0, 0, 1, 1)); sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_pack_table(gd, efl_added, 0, 0, 1, 1)); gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3, @@ -122,8 +122,8 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void { efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Vertical"), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c index 9f54a9d365..66bfe0f2f8 100644 --- a/src/bin/elementary/test_ui_slider.c +++ b/src/bin/elementary/test_ui_slider.c @@ -46,8 +46,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_pack(bx, efl_added)); efl_add(EFL_UI_TEXT_CLASS, bx, @@ -56,8 +56,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_ui_direction_set(efl_added, EFL_UI_DIR_LEFT), efl_pack(bx, efl_added)); @@ -68,8 +68,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event step = _step_size_calculate(0, 9); efl_add(EFL_UI_SLIDER_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), + efl_gfx_hint_align_set(efl_added, 0.5, 0.5), efl_ui_range_step_set(efl_added, step), efl_pack(bx, efl_added)); @@ -79,7 +79,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_range_step_set(efl_added, step), elm_object_disabled_set(efl_added, EINA_TRUE), @@ -95,7 +95,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_range_step_set(efl_added, step), efl_ui_range_value_set(efl_added, 70), @@ -103,7 +103,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(hbx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_range_step_set(efl_added, step), efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), @@ -111,7 +111,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(hbx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_range_value_set(efl_added, 35), efl_ui_range_step_set(efl_added, step), @@ -124,7 +124,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), efl_ui_range_min_max_set(efl_added, 0, 150), efl_ui_range_step_set(efl_added, step), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_cb, NULL), diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c index 3973b3d846..09589a7689 100644 --- a/src/bin/elementary/test_ui_slider_interval.c +++ b/src/bin/elementary/test_ui_slider_interval.c @@ -46,7 +46,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), efl_pack(bx, efl_added)); @@ -57,7 +57,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void step = _step_size_calculate(0, 9); efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), efl_ui_range_step_set(efl_added, step), efl_pack(bx, efl_added)); @@ -68,7 +68,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_slider_interval_value_set(efl_added, 50, 100), efl_ui_range_step_set(efl_added, step), @@ -85,7 +85,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_slider_interval_value_set(efl_added, 50, 100), efl_ui_range_step_set(efl_added, step), @@ -93,7 +93,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_pack(hbx, efl_added)); efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), efl_ui_range_min_max_set(efl_added, 10, 145), efl_ui_slider_interval_value_set(efl_added, 50, 100), efl_ui_range_step_set(efl_added, step), @@ -107,7 +107,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_pack(bx, efl_added)); efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), efl_ui_range_min_max_set(efl_added, 0, 600), efl_ui_slider_interval_value_set(efl_added, 100, 500), efl_ui_range_step_set(efl_added, step), diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c index 84bef407af..318e019e42 100644 --- a/src/bin/elementary/test_ui_tab_pager.c +++ b/src/bin/elementary/test_ui_tab_pager.c @@ -88,8 +88,8 @@ content_add(Eo *parent, char *text) page = efl_add(EFL_UI_LAYOUT_CLASS, parent, efl_file_set(efl_added, buf, "page_layout"), efl_text_set(efl_part(efl_added, "text"), text), - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE)); + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE)); return page; } @@ -133,20 +133,20 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev efl_content_set(win, efl_added)); navi = elm_naviframe_add(layout); - efl_gfx_size_hint_weight_set(navi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_align_set(navi, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(navi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_align_set(navi, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_content_set(efl_part(layout, "menu"), navi); list = elm_list_add(navi); - efl_gfx_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS); elm_naviframe_item_push(navi, "Properties", NULL, NULL, list, NULL); efl_gfx_entity_visible_set(list, EINA_TRUE); tp = efl_add(EFL_UI_TAB_PAGER_CLASS, layout, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), efl_ui_pager_page_size_set(efl_added, EINA_SIZE2D(-1, -1)), efl_ui_pager_padding_set(efl_added, 20), efl_content_set(efl_part(layout, "tab_pager"), efl_added)); diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c index 9f1a20ef11..098fe139b7 100644 --- a/src/bin/elementary/test_ui_table.c +++ b/src/bin/elementary/test_ui_table.c @@ -33,32 +33,32 @@ weights_cb(void *data, const Efl_Event *event) switch (mode) { case NONE: - efl_gfx_size_hint_align_set(table, 0.5, 0.5); + efl_gfx_hint_align_set(table, 0.5, 0.5); for (int i = 0; i < 7; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[i], 0, 0); break; case NONE_BUT_FILL: - efl_gfx_size_hint_fill_set(table, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(table, EINA_TRUE, EINA_TRUE); for (int i = 0; i < 7; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[i], 0, 0); break; case EQUAL: - efl_gfx_size_hint_align_set(table, 0.5, 0.5); + efl_gfx_hint_align_set(table, 0.5, 0.5); for (int i = 0; i < 7; i++) - efl_gfx_size_hint_weight_set(objects[i], 1, 1); + efl_gfx_hint_weight_set(objects[i], 1, 1); break; case ONE: - efl_gfx_size_hint_align_set(table, 0.5, 0.5); + efl_gfx_hint_align_set(table, 0.5, 0.5); for (int i = 0; i < 6; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); - efl_gfx_size_hint_weight_set(objects[6], 1, 1); + efl_gfx_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[6], 1, 1); break; case TWO: - efl_gfx_size_hint_align_set(table, 0.5, 0.5); + efl_gfx_hint_align_set(table, 0.5, 0.5); for (int i = 0; i < 5; i++) - efl_gfx_size_hint_weight_set(objects[i], 0, 0); - efl_gfx_size_hint_weight_set(objects[5], 1, 1); - efl_gfx_size_hint_weight_set(objects[6], 1, 1); + efl_gfx_hint_weight_set(objects[i], 0, 0); + efl_gfx_hint_weight_set(objects[5], 1, 1); + efl_gfx_hint_weight_set(objects[6], 1, 1); break; case CUSTOM: efl_object_override(table, &custom_layout_ops); @@ -71,7 +71,7 @@ user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) { int val = elm_slider_value_get(event->object); for (int i = 0; i < 6; i++) - efl_gfx_size_hint_min_set(objects[i], EINA_SIZE2D(val, val)); + efl_gfx_hint_size_min_set(objects[i], EINA_SIZE2D(val, val)); } static void @@ -85,7 +85,7 @@ static void margin_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); - efl_gfx_size_hint_margin_set(data, val, val, val, val); + efl_gfx_hint_margin_set(data, val, val, val, val); } static void @@ -93,7 +93,7 @@ btnmargins_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); for (int i = 1; i < 7; i++) - efl_gfx_size_hint_margin_set(data, val, val, val, val); + efl_gfx_hint_margin_set(data, val, val, val, val); } static void @@ -102,8 +102,8 @@ alignv_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) double ax, val; val = elm_slider_value_get(event->object); - efl_gfx_size_hint_align_get(objects[1], &ax, NULL); - efl_gfx_size_hint_align_set(objects[1], ax, val); + efl_gfx_hint_align_get(objects[1], &ax, NULL); + efl_gfx_hint_align_set(objects[1], ax, val); } static void @@ -112,8 +112,8 @@ alignh_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) double ay, val; val = elm_slider_value_get(event->object); - efl_gfx_size_hint_align_get(objects[1], NULL, &ay); - efl_gfx_size_hint_align_set(objects[1], val, ay); + efl_gfx_hint_align_get(objects[1], NULL, &ay); + efl_gfx_hint_align_set(objects[1], val, ay); } static void @@ -173,7 +173,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED) m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2; m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2; - m.size = efl_gfx_size_hint_combined_min_get(item); + m.size = efl_gfx_hint_size_combined_min_get(item); efl_gfx_entity_geometry_set(item, m); gmw = MAX(gmw, m.w); @@ -183,7 +183,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED) eina_iterator_free(it); end: - efl_gfx_size_hint_min_set(pack, EINA_SIZE2D(gmw * cols, gmh * rows)); + efl_gfx_hint_size_min_set(pack, EINA_SIZE2D(gmw * cols, gmh * rows)); } void @@ -199,8 +199,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ vbox = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); - efl_gfx_size_hint_weight_set(vbox, 1, 1); - efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); + efl_gfx_hint_weight_set(vbox, 1, 1); + efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); elm_win_resize_object_add(win, vbox); @@ -211,8 +211,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* controls */ f = elm_frame_add(win); elm_object_text_set(f, "Controls"); - efl_gfx_size_hint_align_set(f, -1, -1); - efl_gfx_size_hint_weight_set(f, 1, 0); + efl_gfx_hint_align_set(f, -1, -1); + efl_gfx_hint_weight_set(f, 1, 0); efl_pack(vbox, f); efl_gfx_entity_visible_set(f, 1); @@ -225,14 +225,14 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* weights radio group */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); efl_pack(hbox, bx); chk = o = elm_radio_add(win); elm_object_text_set(o, "No weight"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -240,7 +240,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ o = elm_radio_add(win); elm_object_text_set(o, "No weight + table fill"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE_BUT_FILL); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -249,7 +249,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ o = elm_radio_add(win); elm_object_text_set(o, "Equal weights"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, EQUAL); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -258,7 +258,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ o = elm_radio_add(win); elm_object_text_set(o, "One weight only"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, ONE); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -267,7 +267,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ o = elm_radio_add(win); elm_object_text_set(o, "Two weights"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, TWO); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -276,7 +276,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ o = elm_radio_add(win); elm_object_text_set(o, "Custom layout"); efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); - efl_gfx_size_hint_align_set(o, 0, 0.5); + efl_gfx_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, CUSTOM); elm_radio_group_add(o, chk); efl_pack(bx, o); @@ -288,8 +288,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* min size setter */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -301,8 +301,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); elm_slider_min_max_set(o, 0, 250); elm_slider_inverted_set(o, 1); @@ -314,9 +314,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* inner box padding */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -328,8 +328,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, table); elm_slider_min_max_set(o, 0, 40); elm_slider_inverted_set(o, 1); @@ -341,8 +341,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* outer margin */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 0, 1); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -354,8 +354,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, table); elm_slider_min_max_set(o, 0, 40); elm_slider_inverted_set(o, 1); @@ -367,9 +367,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* button margins */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -381,8 +381,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, table); elm_slider_min_max_set(o, 0, 40); elm_slider_inverted_set(o, 1); @@ -394,9 +394,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* button1 aligns */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -408,8 +408,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 0); - efl_gfx_size_hint_align_set(o, 0.5, -1); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, -1); + efl_gfx_hint_weight_set(o, 1, 1); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, NULL); elm_slider_min_max_set(o, 0, 1); elm_slider_value_set(o, 0.3); @@ -420,8 +420,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_show_set(o, 1); elm_slider_horizontal_set(o, 1); - efl_gfx_size_hint_align_set(o, -1, -1); - efl_gfx_size_hint_weight_set(o, 1, 0); + efl_gfx_hint_align_set(o, -1, -1); + efl_gfx_hint_weight_set(o, 1, 0); efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, NULL); elm_slider_min_max_set(o, 0, 1); elm_slider_value_set(o, 0.3); @@ -431,9 +431,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* ro info */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); o = elm_label_add(win); @@ -449,8 +449,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ o = elm_label_add(win); efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); - efl_gfx_size_hint_align_set(o, 0.5, 0); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, 0); + efl_gfx_hint_weight_set(o, 1, 1); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -458,61 +458,61 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* contents */ f = elm_frame_add(win); elm_object_text_set(f, "Contents"); - efl_gfx_size_hint_align_set(f, -1, -1); - efl_gfx_size_hint_weight_set(f, 1, 1); + efl_gfx_hint_align_set(f, -1, -1); + efl_gfx_hint_weight_set(f, 1, 1); efl_pack(vbox, f); efl_gfx_entity_visible_set(f, 1); - efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_content_set(f, table); efl_gfx_entity_visible_set(table, 1); objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); - efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10)); + efl_gfx_hint_size_min_set(o, EINA_SIZE2D(10, 10)); efl_gfx_color_set(o, 64, 96, 128, 255); efl_pack_table(table, o, 0, 0, 3, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, "Button 1"); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); - efl_gfx_size_hint_align_set(o, 0.3, 0.3); - efl_gfx_size_hint_max_set(o, EINA_SIZE2D(100, 100)); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_align_set(o, 0.3, 0.3); + efl_gfx_hint_size_max_set(o, EINA_SIZE2D(100, 100)); efl_pack_table(table, o, 0, 0, 1, 1); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, "Button 2"); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); efl_pack_table(table, o, 1, 0, 1, 1); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, "Button 3"); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); efl_pack_table(table, o, 2, 0, 1, 1); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, "Button 4"); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); efl_pack_table(table, o, 0, 1, 2, 1); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, "Button 5"); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); efl_pack_table(table, o, 2, 1, 1, 2); efl_gfx_entity_visible_set(o, 1); objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, "Button 6"); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); efl_pack_table(table, o, 0, 2, 2, 1); efl_gfx_entity_visible_set(o, 1); @@ -540,8 +540,8 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED) Eo *table = data; Eo *o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, btn_text("appended")); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); elm_object_tooltip_text_set(o, "Click to unpack"); efl_pack_end(table, o); @@ -568,7 +568,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vbox = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); - efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); + efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); elm_win_resize_object_add(win, vbox); efl_gfx_entity_visible_set(vbox, 1); @@ -580,8 +580,8 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* controls */ f = elm_frame_add(win); elm_object_text_set(f, "Controls"); - efl_gfx_size_hint_align_set(f, -1, -1); - efl_gfx_size_hint_weight_set(f, 1, 0); + efl_gfx_hint_align_set(f, -1, -1); + efl_gfx_hint_weight_set(f, 1, 0); efl_pack(vbox, f); efl_gfx_entity_visible_set(f, 1); @@ -613,9 +613,9 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* ro info */ bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); - efl_gfx_size_hint_align_set(bx, 0, 0.5); - efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bx, 1, 1); + efl_gfx_hint_align_set(bx, 0, 0.5); + efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); + efl_gfx_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); efl_gfx_entity_visible_set(bx, 1); @@ -632,8 +632,8 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, o = elm_label_add(win); efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); - efl_gfx_size_hint_align_set(o, 0.5, 0); - efl_gfx_size_hint_weight_set(o, 1, 1); + efl_gfx_hint_align_set(o, 0.5, 0); + efl_gfx_hint_weight_set(o, 1, 1); efl_pack(bx, o); efl_gfx_entity_visible_set(o, 1); @@ -641,37 +641,37 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* contents */ f = elm_frame_add(win); elm_object_text_set(f, "Contents"); - efl_gfx_size_hint_align_set(f, -1, -1); - efl_gfx_size_hint_weight_set(f, 1, 1); + efl_gfx_hint_align_set(f, -1, -1); + efl_gfx_hint_weight_set(f, 1, 1); efl_pack(vbox, f); efl_gfx_entity_visible_set(f, 1); efl_pack_table_columns_set(table, 4); efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN); - efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_content_set(f, table); efl_gfx_entity_visible_set(table, 1); o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, btn_text(NULL)); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, btn_text(NULL)); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_text_set(o, btn_text(NULL)); - efl_gfx_size_hint_weight_set(o, 0, 0); - efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); + efl_gfx_hint_weight_set(o, 0, 0); + efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); diff --git a/src/bin/elementary/test_ui_textpath.c b/src/bin/elementary/test_ui_textpath.c index b865775b8d..2f5542a17d 100644 --- a/src/bin/elementary/test_ui_textpath.c +++ b/src/bin/elementary/test_ui_textpath.c @@ -99,8 +99,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve box = elm_box_add(win); elm_box_horizontal_set(box, EINA_FALSE); - efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(box, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_entity_visible_set(box, EINA_TRUE); txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win); @@ -114,8 +114,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve hbox = elm_box_add(win); elm_box_horizontal_set(hbox, EINA_TRUE); - efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(hbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_entity_visible_set(hbox, EINA_TRUE); elm_box_pack_end(box, hbox); @@ -141,8 +141,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve hbox = elm_box_add(win); elm_box_horizontal_set(hbox, EINA_TRUE); - efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(hbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_entity_visible_set(hbox, EINA_TRUE); elm_box_pack_end(box, hbox); @@ -150,9 +150,9 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve elm_object_text_set(sld, "Angle"); elm_slider_min_max_set(sld, 0, 360); elm_slider_value_set(sld, 0); - efl_gfx_size_hint_align_set(sld, 0.5, EVAS_HINT_FILL); - efl_gfx_size_hint_weight_set(sld, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); + efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0)); efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath); elm_box_pack_end(hbox, sld); efl_gfx_entity_visible_set(sld, EINA_TRUE); @@ -162,9 +162,9 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve elm_object_text_set(sld, "Slice No"); elm_slider_min_max_set(sld, 20, 300); elm_slider_value_set(sld, 99); - efl_gfx_size_hint_align_set(sld, 0.5, EVAS_HINT_FILL); - efl_gfx_size_hint_weight_set(sld, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); + efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0)); efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath); elm_box_pack_end(hbox, sld); efl_gfx_entity_visible_set(sld, EINA_TRUE); @@ -172,8 +172,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve hbox = elm_box_add(win); elm_box_horizontal_set(hbox, EINA_TRUE); - efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(hbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_entity_visible_set(hbox, EINA_TRUE); elm_box_pack_end(box, hbox); diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c index 6858cf85a9..b0a061660c 100644 --- a/src/bin/elementary/test_win_dialog.c +++ b/src/bin/elementary/test_win_dialog.c @@ -36,14 +36,14 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_ // Notes: // - All objects have 0 weight, this makes the window not resizable. - // - With EO APIs, efl_gfx_size_hint_min_set() is safe to call as EFL will + // - With EO APIs, efl_gfx_hint_size_min_set() is safe to call as EFL will // only set the restricted min size (and combine them for calculation). lb = efl_add(EFL_UI_TEXT_CLASS, dia, efl_text_set(efl_added, "This is a non-resizable dialog."), - efl_gfx_size_hint_min_set(efl_added, size), - efl_gfx_size_hint_max_set(efl_added, size), - efl_gfx_size_hint_weight_set(efl_added, 0, 0)); + efl_gfx_hint_size_min_set(efl_added, size), + efl_gfx_hint_size_max_set(efl_added, size), + efl_gfx_hint_weight_set(efl_added, 0, 0)); // Swallow in the label as the default content, this will make it visible. efl_content_set(dia, lb); @@ -57,9 +57,9 @@ _size_update(void *data, const Efl_Event *ev) Eo *dia = ev->object; Eo *lbl = data; - cmin = efl_gfx_size_hint_combined_min_get(dia); - min = efl_gfx_size_hint_min_get(dia); - max = efl_gfx_size_hint_max_get(dia); + cmin = efl_gfx_hint_size_combined_min_get(dia); + min = efl_gfx_hint_size_min_get(dia); + max = efl_gfx_hint_size_max_get(dia); sz = efl_gfx_entity_size_get(dia); sprintf(buf, "This is a dialog with min/max size
" @@ -86,14 +86,14 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_ efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); elm_object_text_set(lb, "This is a Dialog Window"); - efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); + efl_gfx_hint_weight_set(lb, 1.0, 1.0); // Swallow in the label as the default content, this will make it visible. efl_content_set(dia, lb); // Set min & max size (app-side) - efl_gfx_size_hint_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); - efl_gfx_size_hint_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); + efl_gfx_hint_size_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); + efl_gfx_hint_size_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); } static void @@ -113,14 +113,14 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); elm_object_text_set(lb, "This is a Centered Dialog Window"); - efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); + efl_gfx_hint_weight_set(lb, 1.0, 1.0); // Swallow in the label as the default content, this will make it visible. efl_content_set(dia, lb); // Set min & max size (app-side) - efl_gfx_size_hint_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); - efl_gfx_size_hint_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); + efl_gfx_hint_size_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); + efl_gfx_hint_size_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); efl_ui_win_center(dia, EINA_TRUE, EINA_TRUE); } diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c index 99f54c589e..1b72b0d311 100644 --- a/src/bin/elementary/test_win_indicator.c +++ b/src/bin/elementary/test_win_indicator.c @@ -38,8 +38,8 @@ _create_indicator(void) efl_content_set(win, efl_added)); efl_add(EFL_UI_CLOCK_CLASS, bx, - efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_align_set(efl_added, 0.5, 0.5), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), @@ -94,13 +94,13 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), efl_text_set(efl_added, "Efl.Win.Indicator"), - efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)), + efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)), efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 360)); Eo *bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(300, 0)), efl_content_set(win, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c index 5209b20014..ea93f0bae6 100644 --- a/src/bin/elementary/test_win_inline.c +++ b/src/bin/elementary/test_win_inline.c @@ -235,7 +235,7 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_win_alpha_set(win2, EINA_TRUE); evas_object_size_hint_weight_set(elm_win_inlined_image_object_get(win2), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(elm_win_inlined_image_object_get(win2), EVAS_HINT_FILL, EVAS_HINT_FILL); - efl_gfx_size_hint_margin_set(elm_win_inlined_image_object_get(win2), 20, 20, 20, 20); + efl_gfx_hint_margin_set(elm_win_inlined_image_object_get(win2), 20, 20, 20, 20); efl_pack(box, elm_win_inlined_image_object_get(win2)); evas_object_resize(win2, 300, 200); diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc index 7f85e19593..8b0364744c 100644 --- a/src/examples/elementary/button_cxx_example_01.cc +++ b/src/examples/elementary/button_cxx_example_01.cc @@ -27,7 +27,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) efl::ui::Box box_initial(instantiate, win); box_initial.direction_set(EFL_UI_DIR_HORIZONTAL); - box_initial.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); + box_initial.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); box.pack_end(box_initial); efl::ui::Button btn(instantiate, win); @@ -78,7 +78,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) efl::ui::Box box_gap(instantiate, win); box_gap.direction_set(EFL_UI_DIR_HORIZONTAL); - box_gap.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); + box_gap.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); box.pack_end(box_gap); efl::ui::Button btn4(instantiate, win); @@ -99,7 +99,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) up.autorepeat_enabled_set(true); up.autorepeat_initial_timeout_set(1.0); up.autorepeat_gap_timeout_set(0.5); - up.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); + up.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); up.hint_fill_set(true, false); up.hint_align_set(0.5, 0.0); box.pack_end(up); @@ -180,7 +180,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) left.autorepeat_enabled_set(true); left.autorepeat_initial_timeout_set(1.0); left.autorepeat_gap_timeout_set(0.5); - left.hint_weight_set(0.0, EFL_GFX_SIZE_HINT_EXPAND); + left.hint_weight_set(0.0, EFL_GFX_HINT_EXPAND); left.hint_fill_set(false, true); left.hint_align_set(0.0, 0.5); box_inferior.pack_end(left); @@ -200,7 +200,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) right.autorepeat_enabled_set(true); right.autorepeat_initial_timeout_set(1.0); right.autorepeat_gap_timeout_set(0.5); - right.hint_weight_set(0.0, EFL_GFX_SIZE_HINT_EXPAND); + right.hint_weight_set(0.0, EFL_GFX_HINT_EXPAND); right.hint_fill_set(false, true); right.hint_align_set(0.0, 0.5); box_inferior.pack_end(right); @@ -214,7 +214,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) down.autorepeat_enabled_set(true); down.autorepeat_initial_timeout_set(1.0); down.autorepeat_gap_timeout_set(0.5); - down.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); + down.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); down.hint_fill_set(true, false); down.hint_align_set(0.5, 0.0); box.pack_end(down); diff --git a/src/examples/elementary/efl_ui_grid_example_1.c b/src/examples/elementary/efl_ui_grid_example_1.c index 257f5daf39..b2960bb04b 100644 --- a/src/examples/elementary/efl_ui_grid_example_1.c +++ b/src/examples/elementary/efl_ui_grid_example_1.c @@ -23,8 +23,8 @@ EoGenerate(const Efl_Class *klass, Eo *parent, Efl_Ui_Dir dir) { Eo* obj = efl_add(klass, parent); if (dir != EFL_UI_DIR_DEFAULT) efl_ui_direction_set(obj, dir); - efl_gfx_size_hint_weight_set(obj, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_fill_set(obj, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(obj, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_fill_set(obj, EINA_TRUE, EINA_TRUE); return obj; } @@ -47,8 +47,8 @@ elm_main(int argc, char **argv) elm_win_resize_object_add(win, box); Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, box); - efl_gfx_size_hint_weight_set(btn, 0.3, 0.3); - efl_gfx_size_hint_fill_set(btn, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(btn, 0.3, 0.3); + efl_gfx_hint_fill_set(btn, EINA_TRUE, EINA_TRUE); efl_text_set(btn, "BUTTON"); efl_pack_end(box, btn); diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c index c2bb8946dc..b52cc0e9ed 100644 --- a/src/examples/elementary/efl_ui_list_example_1.c +++ b/src/examples/elementary/efl_ui_list_example_1.c @@ -115,15 +115,15 @@ elm_main(int argc, char **argv) wbox = efl_add(EFL_UI_BOX_CLASS, win); efl_ui_direction_set(wbox, EFL_UI_DIR_VERTICAL); - efl_gfx_size_hint_weight_set(wbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); - efl_gfx_size_hint_fill_set(wbox, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(wbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); + efl_gfx_hint_fill_set(wbox, EINA_TRUE, EINA_TRUE); if ((argv[1] != NULL) && (!strcmp(argv[1], "empty"))) emptystyle = EINA_TRUE; priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox); - efl_gfx_size_hint_weight_set(list, EFL_GFX_SIZE_HINT_EXPAND, 0.9); + efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9); efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL); efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL); @@ -145,7 +145,7 @@ elm_main(int argc, char **argv) efl_ui_direction_set(ibox, EFL_UI_DIR_HORIZONTAL); txt = efl_add(EFL_UI_TEXT_CLASS, ibox); - efl_gfx_size_hint_weight_set(txt, 0.95, EFL_GFX_SIZE_HINT_EXPAND); + efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND); efl_text_halign_set(txt, 0.2); efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); snprintf(buf, sizeof(buf), "empty style item [%d]", i); @@ -153,7 +153,7 @@ elm_main(int argc, char **argv) efl_pack_end(ibox, txt); check = efl_add(EFL_UI_CHECK_CLASS, ibox); - efl_gfx_size_hint_weight_set(check, 0.05, EFL_GFX_SIZE_HINT_EXPAND); + efl_gfx_hint_weight_set(check, 0.05, EFL_GFX_HINT_EXPAND); efl_pack_end(ibox, check); if (i % 2) @@ -223,7 +223,7 @@ elm_main(int argc, char **argv) /*select mode */ txt = efl_add(EFL_UI_TEXT_CLASS, wbox); - efl_gfx_size_hint_weight_set(txt, EFL_GFX_SIZE_HINT_EXPAND, 0.01); + efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); efl_text_halign_set(txt, 0.02); efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); efl_text_set(txt, "Select Mode"); @@ -231,7 +231,7 @@ elm_main(int argc, char **argv) bbox = efl_add(EFL_UI_BOX_CLASS, wbox); efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); - efl_gfx_size_hint_weight_set(bbox, EFL_GFX_SIZE_HINT_EXPAND, 0.05); + efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05); select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox); efl_text_set(radio, "SINGLE"); @@ -260,7 +260,7 @@ elm_main(int argc, char **argv) /* scroll mode */ txt = efl_add(EFL_UI_TEXT_CLASS, wbox); - efl_gfx_size_hint_weight_set(txt, EFL_GFX_SIZE_HINT_EXPAND, 0.01); + efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); efl_text_halign_set(txt, 0.02); efl_text_set(txt, "Item Scroll"); @@ -268,27 +268,27 @@ elm_main(int argc, char **argv) priv_d.slider = slider = efl_add(EFL_UI_SLIDER_CLASS, wbox); efl_ui_direction_set(slider, EFL_UI_DIR_HORIZONTAL); - efl_gfx_size_hint_weight_set(slider, 0.0, 0.05); - efl_gfx_size_hint_align_set(slider, 0.5, 0.5); - efl_gfx_size_hint_min_set(slider, EINA_SIZE2D(380, 20)); + efl_gfx_hint_weight_set(slider, 0.0, 0.05); + efl_gfx_hint_align_set(slider, 0.5, 0.5); + efl_gfx_hint_size_min_set(slider, EINA_SIZE2D(380, 20)); efl_ui_range_min_max_set(slider, 0.0, 1.0); efl_pack_end(wbox, slider); bbox = efl_add(EFL_UI_BOX_CLASS, wbox); efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); - efl_gfx_size_hint_weight_set(bbox, EFL_GFX_SIZE_HINT_EXPAND, 0.05); + efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05); rbox = efl_add(EFL_UI_BOX_CLASS, bbox); efl_ui_direction_set(rbox, EFL_UI_DIR_VERTICAL); anim_radio = radio = efl_add(EFL_UI_RADIO_CLASS, rbox); - efl_gfx_size_hint_align_set(radio, 0.5, 0.5); + efl_gfx_hint_align_set(radio, 0.5, 0.5); efl_text_set(radio, "ANIMATION OFF"); efl_ui_radio_state_value_set(radio, 0); efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _anim_radio_changed, NULL); efl_pack_end(rbox, radio); radio = efl_add(EFL_UI_RADIO_CLASS, rbox); - efl_gfx_size_hint_align_set(radio, 0.5, 0.5); + efl_gfx_hint_align_set(radio, 0.5, 0.5); efl_text_set(radio, "ANIMATION ON"); efl_ui_radio_state_value_set(radio, 1); efl_ui_radio_group_add(radio, anim_radio); @@ -301,15 +301,15 @@ elm_main(int argc, char **argv) scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); efl_text_set(scrl_btn, "Scroll Item"); - efl_gfx_size_hint_align_set(scrl_btn, 0.5, 0.5); - efl_gfx_size_hint_min_set(scrl_btn, EINA_SIZE2D(200, 25)); + efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5); + efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25)); efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_btn_clicked, NULL); efl_pack_end(rbox, scrl_btn); scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); efl_text_set(scrl_btn, "Scroll Item Align"); - efl_gfx_size_hint_align_set(scrl_btn, 0.5, 0.5); - efl_gfx_size_hint_min_set(scrl_btn, EINA_SIZE2D(200, 25)); + efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5); + efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25)); efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_align_btn_clicked, NULL); efl_pack_end(rbox, scrl_btn); diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc index 8038782026..3e9254e3ea 100644 --- a/src/examples/elementary/slider_cxx_example.cc +++ b/src/examples/elementary/slider_cxx_example.cc @@ -59,7 +59,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) sl6.direction_set(EFL_UI_DIR_HORIZONTAL); sl6.range_min_max_set(0, 10); sl6.hint_fill_set(false, true); - sl6.hint_weight_set(0, EFL_GFX_SIZE_HINT_EXPAND); + sl6.hint_weight_set(0, EFL_GFX_HINT_EXPAND); bx.pack_end(sl6); efl::ui::Slider sl7(instantiate, win); diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c index d5f1d37b21..2e55da773a 100644 --- a/src/examples/evas/evas-hints.c +++ b/src/examples/evas/evas-hints.c @@ -119,7 +119,7 @@ _print_rect_stats(Evas_Object *rect) printf("\talign hints: h(%f), v(%f)\n", x, y); - cmin = efl_gfx_size_hint_combined_min_get(rect); + cmin = efl_gfx_hint_size_combined_min_get(rect); printf("\tmin. size hints: h(%d), v(%d)\n", cmin.w, cmin.h); diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index f09265f37b..1857990f42 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -1,4 +1,4 @@ -#define EFL_GFX_SIZE_HINT_PROTECTED +#define EFL_GFX_HINT_PROTECTED #include "edje_private.h" @@ -1004,7 +1004,7 @@ _edje_recalc_do(Edje *ed) ed->recalc_hints = EINA_FALSE; edje_object_size_min_calc(ed->obj, &min.w, &min.h); - efl_gfx_size_hint_restricted_min_set(ed->obj, min); + efl_gfx_hint_size_restricted_min_set(ed->obj, min); } if (!ed->collection) return; @@ -2906,7 +2906,7 @@ _edje_part_recalc_single(Edje *ed, efl_canvas_group_need_recalculate_set(ep->object, 1); efl_canvas_group_calculate(ep->object); - lmin = efl_gfx_size_hint_restricted_min_get(ep->object); + lmin = efl_gfx_hint_size_restricted_min_get(ep->object); if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) { if (lmin.w > minw) minw = lmin.w; @@ -2924,7 +2924,7 @@ _edje_part_recalc_single(Edje *ed, efl_canvas_group_need_recalculate_set(ep->object, 1); efl_canvas_group_calculate(ep->object); - lmin = efl_gfx_size_hint_restricted_min_get(ep->object); + lmin = efl_gfx_hint_size_restricted_min_get(ep->object); if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) { if (lmin.w > minw) minw = lmin.w; diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 0ac67feea8..35772f8854 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -54,7 +54,7 @@ extern "C" { /* Add here all the required ifdef for any @protected method */ #ifdef EFL_BUILD # define EFL_PACK_LAYOUT_PROTECTED -# define EFL_GFX_SIZE_HINT_PROTECTED +# define EFL_GFX_HINT_PROTECTED #endif /** @@ -134,7 +134,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; #include "interfaces/efl_gfx_gradient_radial.eo.h" #include "interfaces/efl_gfx_filter.eo.h" #include "interfaces/efl_gfx_blur.eo.h" -#include "interfaces/efl_gfx_size_hint.eo.h" +#include "interfaces/efl_gfx_hint.eo.h" #include "interfaces/efl_gfx_color_class.eo.h" #include "interfaces/efl_gfx_text_class.eo.h" #include "interfaces/efl_gfx_size_class.eo.h" diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo index 5f40f6f17a..4c4eb21e98 100644 --- a/src/lib/efl/interfaces/efl_gfx_entity.eo +++ b/src/lib/efl/interfaces/efl_gfx_entity.eo @@ -31,7 +31,7 @@ interface @beta Efl.Gfx.Entity { Note that setting the actual size of an object might be the job of its container, so this function might have no effect. - Look at @Efl.Gfx.Size_Hint instead, when manipulating + Look at @Efl.Gfx.Hint instead, when manipulating widgets. ]] } diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_hint.eo similarity index 87% rename from src/lib/efl/interfaces/efl_gfx_size_hint.eo rename to src/lib/efl/interfaces/efl_gfx_hint.eo index af01fe08be..2cbcf87676 100644 --- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_hint.eo @@ -1,12 +1,12 @@ import eina_types; import efl_gfx_types; -const Efl.Gfx.Size_Hint_Expand: double = 1.0; - [[Use with @Efl.Gfx.Size_Hint.hint_weight.]] +const Efl.Gfx.Hint_Expand: double = 1.0; + [[Use with @Efl.Gfx.Hint.hint_weight.]] -interface @beta Efl.Gfx.Size_Hint +interface @beta Efl.Gfx.Hint { - [[Efl graphics size hint interface]] + [[Efl graphics hint interface]] event_prefix: efl_gfx_entity; methods { @property hint_aspect { @@ -27,7 +27,7 @@ interface @beta Efl.Gfx.Size_Hint @image html aspect-control-horizontal.png */ values { - mode: Efl.Gfx.Size_Hint_Aspect; [[Mode of interpretation.]] + mode: Efl.Gfx.Hint_Aspect; [[Mode of interpretation.]] sz: Eina.Size2D; [[Base size to use for aspecting.]] /* FIXME: do we want min/max like Edje instead?? @@ -36,7 +36,7 @@ interface @beta Efl.Gfx.Size_Hint */ } } - @property hint_max { + @property hint_size_max { [[Hints on the object's maximum size. This is not a size enforcement in any way, it's just a hint @@ -49,7 +49,7 @@ interface @beta Efl.Gfx.Size_Hint queried by managers. Note: Smart objects (such as elementary) can have their own - size hint policy. So calling this API may or may not affect + hint policy. So calling this API may or may not affect the size of smart objects. ]] values { @@ -57,7 +57,7 @@ interface @beta Efl.Gfx.Size_Hint default for canvas objects).]] } } - @property hint_min { + @property hint_size_min { [[Hints on the object's minimum size. This is not a size enforcement in any way, it's just a hint @@ -76,7 +76,7 @@ interface @beta Efl.Gfx.Size_Hint sz: Eina.Size2D; [[Minimum size (hint) in pixels.]] } } - @property hint_restricted_min { + @property hint_size_restricted_min { [[Internal hints for an object's minimum size. This is not a size enforcement in any way, it's just a hint @@ -88,7 +88,7 @@ interface @beta Efl.Gfx.Size_Hint Note: This property is internal and meant for widget developers to define the absolute minimum size of the object. EFL itself sets this size internally, so any change to it from an application - might be ignored. Use @.hint_min instead. + might be ignored. Use @.hint_size_min instead. ]] set @protected { [[This function is protected as it is meant for widgets to indicate @@ -102,13 +102,13 @@ interface @beta Efl.Gfx.Size_Hint sz: Eina.Size2D; [[Minimum size (hint) in pixels.]] } } - @property hint_combined_min { - [[Read-only minimum size combining both @.hint_restricted_min and - @.hint_min size hints. + @property hint_size_combined_min { + [[Read-only minimum size combining both @.hint_size_restricted_min and + @.hint_size_min hints. - @.hint_restricted_min is intended for mostly internal usage - and widget developers, and @.hint_min is intended to be - set from application side. @.hint_combined_min combines both values + @.hint_size_restricted_min is intended for mostly internal usage + and widget developers, and @.hint_size_min is intended to be + set from application side. @.hint_size_combined_min combines both values by taking their repective maximum (in both width and height), and is used internally to get an object's minimum size. ]] @@ -127,7 +127,7 @@ interface @beta Efl.Gfx.Size_Hint placing the object accordingly. Note: Smart objects (such as elementary) can have their own - size hint policy. So calling this API may or may not affect + hint policy. So calling this API may or may not affect the size of smart objects. ]] /* @@ -146,7 +146,7 @@ interface @beta Efl.Gfx.Size_Hint This is a hint on how a container object should resize a given child within its area. Containers may adhere to the simpler logic of just expanding the child object's dimensions to fit - its own (see the @Efl.Gfx.Size_Hint_Expand helper weight macro) or + its own (see the @Efl.Gfx.Hint_Expand helper weight macro) or the complete one of taking each child's weight hint as real weights to how much of its size to allocate for them in each axis. A container is supposed to, after normalizing the @@ -195,7 +195,7 @@ interface @beta Efl.Gfx.Size_Hint or "fill" by some users. @.hint_fill specify whether to fill the space inside the boundaries of a container/manager. - Maximum size hints should be enforced with higher + Maximum hints should be enforced with higher priority, if they are set. Also, any @.hint_margin set on objects should add up to the object space on the final scene composition. @@ -217,6 +217,6 @@ interface @beta Efl.Gfx.Size_Hint } } events { - change,size,hints: void; [[Object size hints changed.]] + change,size,hints: void; [[Object hints changed.]] } } diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot index 9af1daf273..6f64ce30f0 100644 --- a/src/lib/efl/interfaces/efl_gfx_types.eot +++ b/src/lib/efl/interfaces/efl_gfx_types.eot @@ -169,11 +169,11 @@ struct Efl.Gfx.Event.Render_Post updated in the canvas.]] } -enum Efl.Gfx.Size_Hint_Aspect +enum Efl.Gfx.Hint_Aspect { [[Aspect types/policies for scaling size hints. - See also @Efl.Gfx.Size_Hint.hint_aspect. + See also @Efl.Gfx.Hint.hint_aspect. ]] none = 0, [[No preference on either direction of the container diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index aee86025d6..6c2c495802 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c @@ -43,7 +43,7 @@ #include "interfaces/efl_gfx_filter.eo.c" #include "interfaces/efl_gfx_blur.eo.c" -#include "interfaces/efl_gfx_size_hint.eo.c" +#include "interfaces/efl_gfx_hint.eo.c" #include "interfaces/efl_canvas_scene.eo.c" #include "interfaces/efl_canvas_pointer.eo.c" diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index 4c862196d2..adf9a1300b 100644 --- a/src/lib/efl/interfaces/meson.build +++ b/src/lib/efl/interfaces/meson.build @@ -72,7 +72,7 @@ pub_eo_files = [ 'efl_gfx_gradient_radial.eo', 'efl_gfx_filter.eo', 'efl_gfx_blur.eo', - 'efl_gfx_size_hint.eo', + 'efl_gfx_hint.eo', 'efl_model.eo', 'efl_animator.eo', 'efl_interpolator.eo', diff --git a/src/lib/elementary/efl_page_indicator_icon.c b/src/lib/elementary/efl_page_indicator_icon.c index 21a42f1654..3c9c54e75e 100644 --- a/src/lib/elementary/efl_page_indicator_icon.c +++ b/src/lib/elementary/efl_page_indicator_icon.c @@ -58,9 +58,9 @@ _efl_page_indicator_icon_pack(Eo *obj, item = efl_add(EFL_CANVAS_LAYOUT_CLASS, spd->idbox); elm_widget_theme_object_set(spd->idbox, item, "pager", "indicator", "default"); - efl_gfx_size_hint_align_set(item, 0.5, 0.5); - efl_gfx_size_hint_weight_set(item, 0, 0); - efl_gfx_size_hint_fill_set(item, 0, 0); + efl_gfx_hint_align_set(item, 0.5, 0.5); + efl_gfx_hint_weight_set(item, 0, 0); + efl_gfx_hint_fill_set(item, 0, 0); if (index == spd->cnt) { @@ -145,9 +145,9 @@ _efl_page_indicator_icon_efl_page_indicator_bind(Eo *obj, elm_widget_theme_object_set(spd->idbox, item, "pager", "indicator", "default"); - efl_gfx_size_hint_align_set(item, 0.5, 0.5); - efl_gfx_size_hint_weight_set(item, 0, 0); - efl_gfx_size_hint_fill_set(item, 0, 0); + efl_gfx_hint_align_set(item, 0.5, 0.5); + efl_gfx_hint_weight_set(item, 0, 0); + efl_gfx_hint_fill_set(item, 0, 0); efl_pack_end(spd->idbox, item); } diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c index 3b5f0a9c43..90c5d1b42f 100644 --- a/src/lib/elementary/efl_ui_box_layout.c +++ b/src/lib/elementary/efl_ui_box_layout.c @@ -1,4 +1,4 @@ -#define EFL_GFX_SIZE_HINT_PROTECTED +#define EFL_GFX_HINT_PROTECTED #include "efl_ui_box_private.h" @@ -18,7 +18,7 @@ struct _Item_Calc Eina_Bool fill[2]; Eina_Size2D max, min, aspect; int pad[4]; - Efl_Gfx_Size_Hint_Aspect aspect_type; + Efl_Gfx_Hint_Aspect aspect_type; int id; }; @@ -91,7 +91,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd) Eina_Bool box_fill[2] = { EINA_FALSE, EINA_FALSE }; boxs = efl_gfx_entity_geometry_get(ui_box); - efl_gfx_size_hint_margin_get(ui_box, &boxl, &boxr, &boxt, &boxb); + efl_gfx_hint_margin_get(ui_box, &boxl, &boxr, &boxt, &boxb); scale = efl_gfx_entity_scale_get(ui_box); // Box align: used if "item has max size and fill" or "no item has a weight" @@ -112,7 +112,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd) count = eina_list_count(bd->children); if (!count) { - efl_gfx_size_hint_min_set(ui_box, EINA_SIZE2D(0, 0)); + efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(0, 0)); return; } @@ -133,13 +133,13 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd) item = &items[id]; o = item->obj = opt->obj; - efl_gfx_size_hint_weight_get(o, &item->weight[0], &item->weight[1]); - efl_gfx_size_hint_align_get(o, &item->align[0], &item->align[1]); - efl_gfx_size_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]); - efl_gfx_size_hint_fill_get(o, &item->fill[0], &item->fill[1]); - item->max = efl_gfx_size_hint_max_get(o); - item->min = efl_gfx_size_hint_combined_min_get(o); - efl_gfx_size_hint_aspect_get(o, &item->aspect_type, &item->aspect); + efl_gfx_hint_weight_get(o, &item->weight[0], &item->weight[1]); + efl_gfx_hint_align_get(o, &item->align[0], &item->align[1]); + efl_gfx_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]); + efl_gfx_hint_fill_get(o, &item->fill[0], &item->fill[1]); + item->max = efl_gfx_hint_size_max_get(o); + item->min = efl_gfx_hint_size_combined_min_get(o); + efl_gfx_hint_aspect_get(o, &item->aspect_type, &item->aspect); if (horiz && (box_fill[0] || pd->homogeneous)) item->weight[0] = 1; else if (item->weight[0] < 0) item->weight[0] = 0; @@ -176,7 +176,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd) { ERR("Invalid aspect parameter for obj: %p", item->obj); item->aspect.w = item->aspect.h = 0; - item->aspect_type = EFL_GFX_SIZE_HINT_ASPECT_NONE; + item->aspect_type = EFL_GFX_HINT_ASPECT_NONE; } } else @@ -342,13 +342,13 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd) if (horiz) { - efl_gfx_size_hint_min_set(ui_box, EINA_SIZE2D( + efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D( wantw + boxl + boxr + pad * (count - 1), wanth + boxt + boxb)); } else { - efl_gfx_size_hint_min_set(ui_box, EINA_SIZE2D( + efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D( wantw + boxl + boxr, wanth + pad * (count - 1) + boxt + boxb)); } diff --git a/src/lib/elementary/efl_ui_box_stack.c b/src/lib/elementary/efl_ui_box_stack.c index 38bc96cf55..ce356bd33a 100644 --- a/src/lib/elementary/efl_ui_box_stack.c +++ b/src/lib/elementary/efl_ui_box_stack.c @@ -1,4 +1,4 @@ -#define EFL_GFX_SIZE_HINT_PROTECTED +#define EFL_GFX_HINT_PROTECTED #include "efl_ui_box_private.h" @@ -25,11 +25,11 @@ _efl_ui_box_stack_efl_pack_layout_layout_update(Eo *obj, void *_pd EINA_UNUSED) { Evas_Object *child = opt->obj; - cmin = efl_gfx_size_hint_combined_min_get(child); + cmin = efl_gfx_hint_size_combined_min_get(child); if (cmin.w > min.w) min.w = cmin.w; if (cmin.h > min.h) min.h = cmin.h; } - efl_gfx_size_hint_restricted_min_set(obj, min); + efl_gfx_hint_size_restricted_min_set(obj, min); } #include "efl_ui_box_stack.eo.c" diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index c9ecd825b5..4fa6d5a2ce 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -117,8 +117,8 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan) } } - min = efl_gfx_size_hint_min_get(item); - max = efl_gfx_size_hint_max_get(item); + min = efl_gfx_hint_size_min_get(item); + max = efl_gfx_hint_size_max_get(item); if (pd->item.size.w < min.w) pd->item.size.w = min.w; if (pd->item.size.h < min.h) pd->item.size.h = min.h; @@ -139,7 +139,7 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan) // efl_gfx_entity_position_set(item, ipos); efl_gfx_entity_size_set(item, id->geo.size); - //efl_gfx_size_hint_restricted_min_set(item, id->geo.size); + //efl_gfx_hint_size_restricted_min_set(item, id->geo.size); prev = id; count++; @@ -150,7 +150,7 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan) else pd->geo.h = cur.y + pd->item.size.h + pd->item.pad.h - pd->geo.y; - //efl_gfx_size_hint_restricted_min_set(pd->content, pd->geo.size); + //efl_gfx_hint_size_restricted_min_set(pd->content, pd->geo.size); efl_gfx_entity_size_set(pd->content, pd->geo.size); pd->need_update = EINA_FALSE; @@ -172,7 +172,7 @@ _reposition(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan) ipos.y = id->geo.y - pan.y; efl_gfx_entity_position_set(item, ipos); efl_gfx_entity_size_set(item, id->geo.size); - //efl_gfx_size_hint_min_set(item, id->geo.size); + //efl_gfx_hint_size_min_set(item, id->geo.size); } } @@ -708,9 +708,9 @@ _efl_ui_grid_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Grid_Data *pd) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - min = efl_gfx_size_hint_combined_min_get(obj); - max = efl_gfx_size_hint_max_get(obj); - efl_gfx_size_hint_weight_get(obj, &xw, &yw); + min = efl_gfx_hint_size_combined_min_get(obj); + max = efl_gfx_hint_size_max_get(obj); + efl_gfx_hint_weight_get(obj, &xw, &yw); if (pd->smanager) view = efl_ui_scrollable_viewport_geometry_get(pd->smanager); @@ -740,11 +740,11 @@ _efl_ui_grid_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Grid_Data *pd) if (pd->match_content_w) size.w = vmw + min.w; if (pd->match_content_h) size.h = vmh + min.h; - max = efl_gfx_size_hint_max_get(obj); + max = efl_gfx_hint_size_max_get(obj); if ((max.w > 0) && (size.w > max.w)) size.w = max.w; if ((max.h > 0) && (size.h > max.h)) size.h = max.h; pd->geo = view; - efl_gfx_size_hint_min_set(obj, size); + efl_gfx_hint_size_min_set(obj, size); _need_update(pd); return; diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 0b6ecf5b89..a49e7c3141 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -1219,7 +1219,7 @@ _efl_ui_image_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Efl_Ui_Image_Da else { // Ignore restricted here? Combine with min? Hmm... - return efl_gfx_size_hint_combined_min_get(sd->img); + return efl_gfx_hint_size_combined_min_get(sd->img); } } diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c index 237343a024..0773b976b5 100644 --- a/src/lib/elementary/efl_ui_internal_text_scroller.c +++ b/src/lib/elementary/efl_ui_internal_text_scroller.c @@ -118,8 +118,8 @@ _efl_ui_internal_text_scroller_elm_layout_sizing_eval(Eo *obj, // FIXME: should be restricted_min? efl_gfx_entity_size_set(sd->text_table, fsz); - efl_gfx_size_hint_min_set(obj, size); - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, size.h)); + efl_gfx_hint_size_min_set(obj, size); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, size.h)); } } diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c index e7d4bfced9..5511106c65 100644 --- a/src/lib/elementary/efl_ui_list.c +++ b/src/lib/elementary/efl_ui_list.c @@ -517,9 +517,9 @@ _efl_ui_list_elm_layout_sizing_eval(Eo *obj, Efl_Ui_List_Data *pd) if (pd->box) { - min = efl_gfx_size_hint_combined_min_get(pd->box); - max = efl_gfx_size_hint_max_get(pd->box); - efl_gfx_size_hint_weight_get(pd->box, &xw, &yw); + min = efl_gfx_hint_size_combined_min_get(pd->box); + max = efl_gfx_hint_size_max_get(pd->box); + efl_gfx_hint_weight_get(pd->box, &xw, &yw); } if (pd->smanager) @@ -552,11 +552,11 @@ _efl_ui_list_elm_layout_sizing_eval(Eo *obj, Efl_Ui_List_Data *pd) if (pd->match_content_w) size.w = vmw + min.w; if (pd->match_content_h) size.h = vmh + min.h; - max = efl_gfx_size_hint_max_get(obj); + max = efl_gfx_hint_size_max_get(obj); if ((max.w > 0) && (size.w > max.w)) size.w = max.w; if ((max.h > 0) && (size.h > max.h)) size.h = max.h; - efl_gfx_size_hint_min_set(obj, size); + efl_gfx_hint_size_min_set(obj, size); } //FIXME: is this box related API could be improved more? diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c index 7370fce15f..60a8c31e93 100644 --- a/src/lib/elementary/efl_ui_list_view.c +++ b/src/lib/elementary/efl_ui_list_view.c @@ -615,7 +615,7 @@ _efl_ui_list_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_View_Data *pd) efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h); - efl_gfx_size_hint_restricted_min_set(obj, min); + efl_gfx_hint_size_restricted_min_set(obj, min); efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_SIZE_CHANGED, _efl_ui_list_view_bar_size_changed_cb, obj); diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.c b/src/lib/elementary/efl_ui_list_view_precise_layouter.c index 488d4deeec..d20d706d3f 100644 --- a/src/lib/elementary/efl_ui_list_view_precise_layouter.c +++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.c @@ -60,12 +60,12 @@ _item_size_calc(Efl_Ui_List_View_Precise_Layouter_Data *pd, Efl_Ui_List_View_Lay Eina_Bool fill[2]; Eina_Size2D max; - efl_gfx_size_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]); + efl_gfx_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]); evas_object_geometry_get(pd->modeler, &boxx, &boxy, &boxw, &boxh); - efl_gfx_size_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb); - efl_gfx_size_hint_align_get(item->layout, &align[0], &align[1]); - efl_gfx_size_hint_fill_get(item->layout, &fill[0], &fill[1]); - max = efl_gfx_size_hint_max_get(item->layout); + efl_gfx_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb); + efl_gfx_hint_align_get(item->layout, &align[0], &align[1]); + efl_gfx_hint_fill_get(item->layout, &fill[0], &fill[1]); + max = efl_gfx_hint_size_max_get(item->layout); // box outer margin boxw -= boxl + boxr; @@ -145,9 +145,9 @@ _item_min_calc(Efl_Ui_List_View_Precise_Layouter_Data *pd, Efl_Ui_List_View_Layo Efl_Ui_List_View_Layout_Item *layout_item; int i, pad[4]; - Eina_Size2D min = efl_gfx_size_hint_combined_min_get(item->layout); + Eina_Size2D min = efl_gfx_hint_size_combined_min_get(item->layout); - efl_gfx_size_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]); + efl_gfx_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]); min.w += pad[0] + pad[1]; min.h += pad[2] + pad[3]; @@ -634,7 +634,7 @@ _efl_ui_list_view_relayout_layout_do(Efl_Ui_List_View_Precise_Layouter_Data *pd) _calc_range(pd); evas_object_geometry_get(pd->modeler, &boxx, &boxy, &boxw, &boxh); - efl_gfx_size_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb); + efl_gfx_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb); // box outer margin boxw -= boxl + boxr; @@ -681,7 +681,7 @@ _efl_ui_list_view_relayout_layout_do(Efl_Ui_List_View_Precise_Layouter_Data *pd) if (pd->resize) _item_size_calc(pd, layout_item); - efl_gfx_size_hint_weight_get(layout_item->layout, &weight_x, &weight_y); + efl_gfx_hint_weight_get(layout_item->layout, &weight_x, &weight_y); } else { diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index 97dcd759b1..285a6eb22c 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED -#define EFL_GFX_SIZE_HINT_PROTECTED +#define EFL_GFX_HINT_PROTECTED #define EFL_PART_PROTECTED #include @@ -223,17 +223,17 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd) if (first_content) { if (!sd->first_hint_min_allow) - sd->first_min = efl_gfx_size_hint_combined_min_get(first_content); + sd->first_min = efl_gfx_hint_size_combined_min_get(first_content); else - sd->first_min = efl_gfx_size_hint_min_get(first_content); + sd->first_min = efl_gfx_hint_size_min_get(first_content); } if (second_content) { if (!sd->second_hint_min_allow) - sd->second_min = efl_gfx_size_hint_combined_min_get(second_content); + sd->second_min = efl_gfx_hint_size_combined_min_get(second_content); else - sd->second_min = efl_gfx_size_hint_min_get(second_content); + sd->second_min = efl_gfx_hint_size_min_get(second_content); } if (sd->dir == EFL_UI_DIR_HORIZONTAL) @@ -247,7 +247,7 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd) min.h = MAX(sd->first_min.h, sd->second_min.h); } - efl_gfx_size_hint_restricted_min_set(obj, min); + efl_gfx_hint_size_restricted_min_set(obj, min); _set_min_size_new(obj); } diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo index d7e6da12a4..2c12ac72f4 100644 --- a/src/lib/elementary/efl_ui_panes_part.eo +++ b/src/lib/elementary/efl_ui_panes_part.eo @@ -6,7 +6,7 @@ class @beta Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content @property hint_min_allow { [[Allows the user to set size hints to be respected and ignored combined with a minimum size. If this flag is set, the minimum size set by - @Efl.Gfx.Size_Hint.hint_min.set is respected forcefully. + @Efl.Gfx.Hint.hint_size_min.set is respected forcefully. ]] values { allow: bool; [[If $true minimum size is forced]] @@ -15,7 +15,7 @@ class @beta Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content @property split_ratio_min { [[Controls the relative minimum size of panes widget's part. - If @Efl.Gfx.Size_Hint.hint_min.set is also used along with + If @Efl.Gfx.Hint.hint_size_min.set is also used along with @.split_ratio_min.set, maximum value is set as minimum size to part. ]] values { diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c index 6afdd55667..51fe9829bf 100644 --- a/src/lib/elementary/efl_ui_popup.c +++ b/src/lib/elementary/efl_ui_popup.c @@ -259,7 +259,7 @@ _sizing_eval(Eo *obj) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(minw, minh)); Eina_Size2D size = efl_gfx_entity_size_get(obj); diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c index d23e2919b3..1d4295e183 100644 --- a/src/lib/elementary/efl_ui_scroll_alert_popup.c +++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c @@ -99,7 +99,7 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd, efl_gfx_entity_size_set(obj, new_size); } - efl_gfx_size_hint_min_set(obj, new_min); + efl_gfx_hint_size_min_set(obj, new_min); } static void @@ -159,8 +159,8 @@ _efl_ui_scroll_alert_popup_content_set(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data * pd->content = content; //Content should have expand propeties since the scroller is not layout layer - efl_gfx_size_hint_weight_set(pd->content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(pd->content, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(pd->content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_fill_set(pd->content, EINA_TRUE, EINA_TRUE); efl_content_set(pd->scroller, pd->content); } diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c index be2e773bc4..af9228c6c0 100644 --- a/src/lib/elementary/efl_ui_scroller.c +++ b/src/lib/elementary/efl_ui_scroller.c @@ -493,9 +493,9 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd) if (sd->content) { - min = efl_gfx_size_hint_combined_min_get(sd->content); - max = efl_gfx_size_hint_max_get(sd->content); - efl_gfx_size_hint_weight_get(sd->content, &xw, &yw); + min = efl_gfx_hint_size_combined_min_get(sd->content); + max = efl_gfx_hint_size_max_get(sd->content); + efl_gfx_hint_weight_get(sd->content, &xw, &yw); } if (sd->smanager) @@ -528,11 +528,11 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd) if (sd->match_content_w) size.w = vmw + min.w; if (sd->match_content_h) size.h = vmh + min.h; - max = efl_gfx_size_hint_max_get(obj); + max = efl_gfx_hint_size_max_get(obj); if ((max.w > 0) && (size.w > max.w)) size.w = max.w; if ((max.h > 0) && (size.h > max.h)) size.h = max.h; - efl_gfx_size_hint_min_set(obj, size); + efl_gfx_hint_size_min_set(obj, size); } EOLIAN static Efl_Ui_Theme_Apply_Result diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index ec51e9b336..e0953a18c5 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -472,8 +472,8 @@ _efl_ui_slider_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, -1)); } static void diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c index f191f87e02..6f49b4026d 100644 --- a/src/lib/elementary/efl_ui_tab_bar.c +++ b/src/lib/elementary/efl_ui_tab_bar.c @@ -221,7 +221,7 @@ _tab_add(Eo *obj, const char *label, const char *icon) ti->label = eina_stringshare_add(label); tab = efl_add(EFL_UI_LAYOUT_CLASS, obj, - efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL)); + efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL)); /* FIXME: This is for tab sizing issue. * Recently, the size_hint_fill API has been added, * but currently tab_bar is not available because it uses evas_object_box. diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c index 3cdaa70898..7185866a44 100644 --- a/src/lib/elementary/efl_ui_tags.c +++ b/src/lib/elementary/efl_ui_tags.c @@ -65,7 +65,7 @@ _shrink_mode_set(Eo *obj, { elm_box_pack_end(sd->box, sd->label); Eina_Size2D label_min = - efl_gfx_size_hint_combined_min_get(sd->label); + efl_gfx_hint_size_combined_min_get(sd->label); w -= label_min.w; w -= box_inner_item_width_padding; } @@ -82,7 +82,7 @@ _shrink_mode_set(Eo *obj, evas_object_show(layout); Eina_Size2D item_min = - efl_gfx_size_hint_combined_min_get(layout); + efl_gfx_hint_size_combined_min_get(layout); w -= item_min.w; w -= box_inner_item_width_padding; @@ -132,7 +132,7 @@ _shrink_mode_set(Eo *obj, edje_object_size_min_calc(sd->end, &w_label_count, &h); elm_coords_finger_size_adjust(1, &w_label_count, 1, &h); - efl_gfx_size_hint_min_set(sd->end, EINA_SIZE2D(w_label_count, h)); + efl_gfx_hint_size_min_set(sd->end, EINA_SIZE2D(w_label_count, h)); elm_box_pack_end(sd->box, sd->end); evas_object_show(sd->end); @@ -426,19 +426,19 @@ _item_new(Efl_Ui_Tags_Data *sd, (layout, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj); - efl_gfx_size_hint_align_set(layout, 0.5, 0.5); - efl_gfx_size_hint_weight_set(layout, 0.0, 0.0); + efl_gfx_hint_align_set(layout, 0.5, 0.5); + efl_gfx_hint_weight_set(layout, 0.0, 0.0); evas_object_show(layout); evas_object_smart_calculate(layout); - min = efl_gfx_size_hint_combined_min_get(layout); + min = efl_gfx_hint_size_combined_min_get(layout); r = efl_gfx_entity_geometry_get(sd->box); if (sd->w_box && min.w > r.w) { elm_coords_finger_size_adjust(1, &r.w, 1, &min.h); - efl_gfx_size_hint_min_set(layout, EINA_SIZE2D(r.w, min.h)); + efl_gfx_hint_size_min_set(layout, EINA_SIZE2D(r.w, min.h)); efl_gfx_entity_size_set(layout, EINA_SIZE2D(r.w, min.h)); } @@ -488,8 +488,8 @@ _efl_ui_tags_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Tags_Data *sd EINA_UNUSED) edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); elm_coords_finger_size_adjust(1, &minw, 1, &minh); - efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh)); - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(maxw, maxh)); + efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(maxw, maxh)); } static void @@ -538,12 +538,12 @@ _box_resize_cb(void *data, elm_layout_sizing_eval(layout); evas_object_smart_calculate(layout); - min = efl_gfx_size_hint_combined_min_get(layout); + min = efl_gfx_hint_size_combined_min_get(layout); if (min.w > r.w - hpad) { min.w = r.w - hpad; - efl_gfx_size_hint_min_set(layout, EINA_SIZE2D(min.w, min.h)); + efl_gfx_hint_size_min_set(layout, EINA_SIZE2D(min.w, min.h)); efl_gfx_entity_size_set(layout, EINA_SIZE2D(min.w, min.h)); } } @@ -770,14 +770,14 @@ _box_min_size_calculate(Evas_Object *box, Evas_Object_Box_Option *opt; evas_object_geometry_get(box, NULL, NULL, &w, NULL); - box_min = efl_gfx_size_hint_combined_min_get(box); + box_min = efl_gfx_hint_size_combined_min_get(box); if (!w) return EINA_FALSE; line_num = 1; EINA_LIST_FOREACH(priv->children, l, opt) { - min = efl_gfx_size_hint_combined_min_get(opt->obj); + min = efl_gfx_hint_size_combined_min_get(opt->obj); linew += min.w; if (lineh < min.h) lineh = min.h; @@ -793,7 +793,7 @@ _box_min_size_calculate(Evas_Object *box, } box_min.h = lineh * line_num + (line_num - 1) * priv->pad.v; - efl_gfx_size_hint_min_set(box, EINA_SIZE2D(box_min.w, box_min.h)); + efl_gfx_hint_size_min_set(box, EINA_SIZE2D(box_min.w, box_min.h)); *line_height = lineh; return EINA_TRUE; @@ -818,8 +818,8 @@ _box_layout_cb(Evas_Object *o, r = efl_gfx_entity_geometry_get(o); - min = efl_gfx_size_hint_combined_min_get(o); - efl_gfx_size_hint_align_get(o, &ax, &ay); + min = efl_gfx_hint_size_combined_min_get(o); + efl_gfx_hint_align_get(o, &ax, &ay); rtl = efl_ui_mirrored_get(data); if (rtl) ax = 1.0 - ax; @@ -848,8 +848,8 @@ _box_layout_cb(Evas_Object *o, obj = opt->obj; evas_object_size_hint_align_get(obj, &ax, &ay); evas_object_size_hint_weight_get(obj, &wx, &wy); - efl_gfx_size_hint_fill_get(obj, &fx, &fy); - obj_min = efl_gfx_size_hint_combined_min_get(obj); + efl_gfx_hint_fill_get(obj, &fx, &fy); + obj_min = efl_gfx_hint_size_combined_min_get(obj); if (EINA_DBL_EQ(ax, -1)) { fx = 1; ax = 0.5; } else if (ax < 0) { ax = 0.0; } @@ -940,10 +940,10 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd) efl_text_interactive_editable_set(efl_added, EINA_TRUE), efl_composite_attach(obj, efl_added)); - efl_gfx_size_hint_min_set(sd->entry, EINA_SIZE2D(MIN_W_ENTRY, 0)); + efl_gfx_hint_size_min_set(sd->entry, EINA_SIZE2D(MIN_W_ENTRY, 0)); evas_object_size_hint_weight_set (sd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_fill_set(sd->entry, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_fill_set(sd->entry, EINA_TRUE, EINA_TRUE); elm_box_pack_end(sd->box, sd->entry); @@ -958,7 +958,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd) edje_object_size_min_calc(sd->end, &button_min_width, &button_min_height); elm_coords_finger_size_adjust(1, &button_min_width, 1, &button_min_height); - efl_gfx_size_hint_min_set(sd->end, EINA_SIZE2D(button_min_width, button_min_height)); + efl_gfx_hint_size_min_set(sd->end, EINA_SIZE2D(button_min_width, button_min_height)); elm_widget_sub_object_add(obj, sd->end); } } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 92b84f1b02..56118a5d81 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -889,7 +889,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd) } elm_layout_sizing_eval(sd->scroller); - min = efl_gfx_size_hint_min_get(sd->scroller); + min = efl_gfx_hint_size_min_get(sd->scroller); if (sd->single_line) { efl_ui_internal_text_scroller_mode_set(sd->scroller, @@ -897,7 +897,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd) edje_object_size_min_calc(wd->resize_obj, &edmin.w, &edmin.h); min.w = edmin.w; min.h = edmin.h; - efl_gfx_size_hint_restricted_min_set(obj, min); + efl_gfx_hint_size_restricted_min_set(obj, min); } sd->cursor_update = EINA_TRUE; @@ -909,7 +909,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd) efl_canvas_text_size_formatted_get(sd->text_obj, &min.w, &min.h); min.w += edmin.w; min.h += edmin.h; - efl_gfx_size_hint_restricted_min_set(obj, min); + efl_gfx_hint_size_restricted_min_set(obj, min); } } diff --git a/src/lib/elementary/efl_ui_text_alert_popup.c b/src/lib/elementary/efl_ui_text_alert_popup.c index 1f8c4601f5..e0d516a598 100644 --- a/src/lib/elementary/efl_ui_text_alert_popup.c +++ b/src/lib/elementary/efl_ui_text_alert_popup.c @@ -103,7 +103,7 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, Eina_Size2D obj efl_gfx_entity_size_set(obj, new_size); } - efl_gfx_size_hint_min_set(obj, new_min); + efl_gfx_hint_size_min_set(obj, new_min); } EOLIAN static void @@ -127,7 +127,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd) //Calculate popup's min size including scroller's min size { elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE); - text_min = efl_gfx_size_hint_combined_min_get(pd->message); + text_min = efl_gfx_hint_size_combined_min_get(pd->message); elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED); elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); @@ -198,7 +198,7 @@ _efl_ui_text_alert_popup_text_set(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, con // TODO: Change internal component to Efl.Ui.Widget pd->message = elm_label_add(obj); //elm_widget_element_update(obj, pd->message, PART_NAME_TEXT); - efl_gfx_size_hint_weight_set(pd->message, EVAS_HINT_EXPAND, + efl_gfx_hint_weight_set(pd->message, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_content_set(pd->scroller, pd->message); } diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index 095c7a3891..8d4076ecdc 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -497,7 +497,7 @@ _path_data_get(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Bool set_min) } if (set_min) { - efl_gfx_size_hint_min_set(obj, rect.size); + efl_gfx_hint_size_min_set(obj, rect.size); } } } @@ -581,8 +581,8 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv) priv->text_obj = edje_object_add(evas_object_evas_get(obj)); elm_widget_theme_object_set(obj, priv->text_obj, "textpath", "base", elm_widget_style_get(obj)); - efl_gfx_size_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_gfx_size_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL); + efl_gfx_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_entity_visible_set(priv->text_obj, EINA_TRUE); evas_object_smart_member_add(priv->text_obj, obj); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 91ee552a8f..edc05d71fe 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_INPUT_EVENT_PROTECTED -#define EFL_GFX_SIZE_HINT_PROTECTED +#define EFL_GFX_HINT_PROTECTED #define EFL_CANVAS_OBJECT_PROTECTED #define EFL_UI_L10N_PROTECTED #define EFL_UI_WIN_INLINED_PROTECTED @@ -901,8 +901,8 @@ _elm_win_size_hints_update(Efl_Ui_Win *win, Efl_Ui_Win_Data *sd) { Eina_Size2D min, max; - min = efl_gfx_size_hint_combined_min_get(win); - max = efl_gfx_size_hint_max_get(win); + min = efl_gfx_hint_size_combined_min_get(win); + max = efl_gfx_hint_size_max_get(win); if (max.w < 1) max.w = -1; if (max.h < 1) max.h = -1; @@ -1691,8 +1691,8 @@ _elm_win_state_change(Ecore_Evas *ee) } if (ch_wm_rotation) { - efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(-1, -1)); - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(-1, -1)); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, -1)); #ifdef HAVE_ELEMENTARY_X ELM_WIN_DATA_ALIVE_CHECK(obj, sd); _elm_win_xwin_update(sd); @@ -3574,7 +3574,7 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize) if ((!minw) && (!minh) && (!sd->deferred_resize_job)) return; // If content has a weight, make resizable - efl_gfx_size_hint_weight_get(sd->legacy.edje, &wx, &wy); + efl_gfx_hint_weight_get(sd->legacy.edje, &wx, &wy); // Content max hint is ignored maxw = sd->max_w; @@ -3612,8 +3612,8 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize) } sd->tmp_updating_hints = 1; - efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(maxw, maxh)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(maxw, maxh)); sd->tmp_updating_hints = 0; _elm_win_size_hints_update(obj, sd); @@ -4880,7 +4880,7 @@ _indicator_resized(void *data, const Efl_Event *event) ELM_WIN_DATA_GET_OR_RETURN(data, sd); Evas_Object *indicator = event->object; Evas_Coord_Size *size = (Evas_Coord_Size *)event->info; - efl_gfx_size_hint_restricted_min_set(indicator, EINA_SIZE2D(size->w, size->h)); + efl_gfx_hint_size_restricted_min_set(indicator, EINA_SIZE2D(size->w, size->h)); _elm_win_frame_obj_update(sd, 0); } @@ -6458,12 +6458,12 @@ _win_aspect_get(Efl_Ui_Win_Data *sd) } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, - Efl_Gfx_Size_Hint_Aspect mode, Eina_Size2D sz) +_efl_ui_win_efl_gfx_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, + Efl_Gfx_Hint_Aspect mode, Eina_Size2D sz) { if (sz.h) _win_aspect_set(pd, (double) sz.w / (double) sz.h); else _win_aspect_set(pd, 0.0); - efl_gfx_size_hint_aspect_set(efl_super(obj, MY_CLASS), mode, sz); + efl_gfx_hint_aspect_set(efl_super(obj, MY_CLASS), mode, sz); #ifdef HAVE_ELEMENTARY_WL2 if (pd->wl.win) ecore_wl2_window_aspect_set(pd->wl.win, sz.w, sz.h, mode); @@ -6471,10 +6471,10 @@ _efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Da } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_hint_weight_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, +_efl_ui_win_efl_gfx_hint_hint_weight_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, double w, double h) { - efl_gfx_size_hint_weight_set(efl_super(obj, MY_CLASS), w, h); + efl_gfx_hint_weight_set(efl_super(obj, MY_CLASS), w, h); #ifdef HAVE_ELEMENTARY_WL2 if (pd->wl.win) ecore_wl2_window_weight_set(pd->wl.win, w, h); @@ -6510,11 +6510,11 @@ _efl_ui_win_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_hint_max_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz) +_efl_ui_win_efl_gfx_hint_hint_size_max_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz) { if (sd->tmp_updating_hints) { - efl_gfx_size_hint_max_set(efl_super(obj, MY_CLASS), sz); + efl_gfx_hint_size_max_set(efl_super(obj, MY_CLASS), sz); } else { @@ -6595,8 +6595,8 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz sd->rot = rotation; if (resize) TRAP(sd, rotation_with_resize_set, rotation); else TRAP(sd, rotation_set, rotation); - efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(-1, -1)); - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(-1, -1)); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, -1)); _elm_win_resize_objects_eval(obj, EINA_FALSE); #ifdef HAVE_ELEMENTARY_X _elm_win_xwin_update(sd); @@ -7442,8 +7442,8 @@ _elm_win_bg_set(Efl_Ui_Win_Data *sd, Eo *bg) } } efl_gfx_entity_visible_set(bg, 1); - efl_gfx_size_hint_fill_set(bg, EINA_TRUE, EINA_TRUE); - efl_gfx_size_hint_weight_set(bg, 1, 1); + efl_gfx_hint_fill_set(bg, EINA_TRUE, EINA_TRUE); + efl_gfx_hint_weight_set(bg, 1, 1); efl_wref_add(bg, &sd->bg); return EINA_TRUE; } @@ -8661,7 +8661,7 @@ elm_win_aspect_set(Eo *obj, double aspect) if (aspect > DBL_EPSILON) sz = EINA_SIZE2D(1000 * aspect, 1000); - efl_gfx_size_hint_aspect_set(obj, EFL_GFX_SIZE_HINT_ASPECT_NONE, sz); + efl_gfx_hint_aspect_set(obj, EFL_GFX_HINT_ASPECT_NONE, sz); } EAPI double @@ -8714,7 +8714,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) EINA_LIST_FOREACH(p->children, l, opt) { child = opt->obj; - efl_gfx_size_hint_weight_get(child, &wx, &wy); + efl_gfx_hint_weight_get(child, &wx, &wy); if (EINA_DBL_EQ(wx, 0.0)) weight_x = 0; if (EINA_DBL_EQ(wy, 0.0)) weight_y = 0; @@ -8724,7 +8724,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) } if (minw < menuw) minw = menuw; - efl_gfx_size_hint_restricted_min_set(o, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_restricted_min_set(o, EINA_SIZE2D(minw, minh)); evas_object_geometry_get(o, &x, &y, &w, &h); if (w < minw) w = minw; if (h < minh) h = minh; @@ -8736,7 +8736,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) evas_object_geometry_set(child, x, y, w, h); } - efl_gfx_size_hint_weight_set(sd->legacy.edje, weight_x, weight_y); + efl_gfx_hint_weight_set(sd->legacy.edje, weight_x, weight_y); //evas_object_smart_changed(sd->legacy.edje); } diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 0f87ba78dc..af1ab0ad80 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -852,9 +852,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac Efl.Screen.screen_dpi { get; } Efl.Screen.screen_rotation { get; } Efl.Screen.screen_size_in_pixels { get; } - Efl.Gfx.Size_Hint.hint_aspect { set; } - Efl.Gfx.Size_Hint.hint_weight { set; } - Efl.Gfx.Size_Hint.hint_max { set; } + Efl.Gfx.Hint.hint_aspect { set; } + Efl.Gfx.Hint.hint_weight { set; } + Efl.Gfx.Hint.hint_size_max { set; } Efl.Text.text { get; set; } Efl.Canvas.Scene.pointer_position { get; } Efl.Canvas.Pointer.pointer_inside { get; } diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 01e2cebc3b..57d6126c0c 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -212,7 +212,7 @@ _shrink_mode_set(Evas_Object *obj, if (sd->label && sd->label_packed) { elm_box_pack_end(sd->box, sd->label); - w -= efl_gfx_size_hint_combined_min_get(sd->label).w; + w -= efl_gfx_hint_size_combined_min_get(sd->label).w; w -= box_inner_item_width_padding; } @@ -229,7 +229,7 @@ _shrink_mode_set(Evas_Object *obj, evas_object_show(VIEW(item)); item->visible = EINA_TRUE; - w -= efl_gfx_size_hint_combined_min_get(VIEW(item)).w; + w -= efl_gfx_hint_size_combined_min_get(VIEW(item)).w; w -= box_inner_item_width_padding; count--; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index b19f006bb7..851c42f642 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1890,7 +1890,7 @@ static inline void _palette_box_prepare(Eo *o) { efl_ui_direction_set(o, EFL_UI_DIR_HORIZONTAL); - efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_entity_visible_set(o, EINA_FALSE); } diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 9a25131fdb..9e8e1e21ab 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -341,13 +341,13 @@ typedef Efl_Input_Flags Evas_Event_Flags; #define EVAS_EVENT_FLAG_ON_HOLD EFL_INPUT_FLAGS_PROCESSED #define EVAS_EVENT_FLAG_ON_SCROLL EFL_INPUT_FLAGS_SCROLLING -typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */ +typedef Efl_Gfx_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */ -#define EVAS_ASPECT_CONTROL_NONE EFL_GFX_SIZE_HINT_ASPECT_NONE -#define EVAS_ASPECT_CONTROL_NEITHER EFL_GFX_SIZE_HINT_ASPECT_NEITHER -#define EVAS_ASPECT_CONTROL_HORIZONTAL EFL_GFX_SIZE_HINT_ASPECT_HORIZONTAL -#define EVAS_ASPECT_CONTROL_VERTICAL EFL_GFX_SIZE_HINT_ASPECT_VERTICAL -#define EVAS_ASPECT_CONTROL_BOTH EFL_GFX_SIZE_HINT_ASPECT_BOTH +#define EVAS_ASPECT_CONTROL_NONE EFL_GFX_HINT_ASPECT_NONE +#define EVAS_ASPECT_CONTROL_NEITHER EFL_GFX_HINT_ASPECT_NEITHER +#define EVAS_ASPECT_CONTROL_HORIZONTAL EFL_GFX_HINT_ASPECT_HORIZONTAL +#define EVAS_ASPECT_CONTROL_VERTICAL EFL_GFX_HINT_ASPECT_VERTICAL +#define EVAS_ASPECT_CONTROL_BOTH EFL_GFX_HINT_ASPECT_BOTH typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction; diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index 6fd25c91cb..da1330f16c 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h @@ -56,7 +56,7 @@ static inline void evas_object_size_hint_combined_min_get(const Eo *obj, int *w, int *h) { Eina_Size2D sz; - sz = efl_gfx_size_hint_combined_min_get(obj); + sz = efl_gfx_hint_size_combined_min_get(obj); if (w) *w = sz.w; if (h) *h = sz.h; } diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 7e4684944d..ceb5df1f55 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -1895,21 +1895,21 @@ EAPI void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_C /** Display mode size hint. */ typedef enum { - EFL_GFX_SIZE_HINT_MODE_NONE = 0, /**< Default mode */ - EFL_GFX_SIZE_HINT_MODE_COMPRESS = 1, /**< Use this mode when you want to give + EFL_GFX_HINT_MODE_NONE = 0, /**< Default mode */ + EFL_GFX_HINT_MODE_COMPRESS = 1, /**< Use this mode when you want to give * compress display mode hint to an object */ - EFL_GFX_SIZE_HINT_MODE_EXPAND = 2, /**< Use this mode when you want to give + EFL_GFX_HINT_MODE_EXPAND = 2, /**< Use this mode when you want to give * expand display mode hint to an object */ - EFL_GFX_SIZE_HINT_MODE_DONT_CHANGE = 3 /**< Use this mode when an object + EFL_GFX_HINT_MODE_DONT_CHANGE = 3 /**< Use this mode when an object * should not change its display mode */ -} Efl_Gfx_Size_Hint_Mode; +} Efl_Gfx_Hint_Mode; -typedef Efl_Gfx_Size_Hint_Mode Evas_Display_Mode; +typedef Efl_Gfx_Hint_Mode Evas_Display_Mode; -#define EVAS_DISPLAY_MODE_NONE EFL_GFX_SIZE_HINT_MODE_NONE -#define EVAS_DISPLAY_MODE_COMPRESS EFL_GFX_SIZE_HINT_MODE_COMPRESS -#define EVAS_DISPLAY_MODE_EXPAND EFL_GFX_SIZE_HINT_MODE_EXPAND -#define EVAS_DISPLAY_MODE_DONT_CHANGE EFL_GFX_SIZE_HINT_MODE_DONT_CHANGE +#define EVAS_DISPLAY_MODE_NONE EFL_GFX_HINT_MODE_NONE +#define EVAS_DISPLAY_MODE_COMPRESS EFL_GFX_HINT_MODE_COMPRESS +#define EVAS_DISPLAY_MODE_EXPAND EFL_GFX_HINT_MODE_EXPAND +#define EVAS_DISPLAY_MODE_DONT_CHANGE EFL_GFX_HINT_MODE_DONT_CHANGE /** * @brief Sets the hints for an object's disply mode, diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index 7ae78d61c2..35a2a3bf57 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -3,7 +3,7 @@ import efl_text_types; struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]] abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, - Efl.Input.Interface, Efl.Gfx.Size_Hint, + Efl.Input.Interface, Efl.Gfx.Hint, Efl.Gfx.Map, Efl.Ui.I18n, Efl.Canvas.Pointer { [[Efl canvas object abstract class]] @@ -600,15 +600,15 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En Efl.Gfx.Stack.stack_above; Efl.Gfx.Stack.raise_to_top; Efl.Gfx.Stack.lower_to_bottom; - Efl.Gfx.Size_Hint.hint_aspect { get; set; } - Efl.Gfx.Size_Hint.hint_align { get; set; } - Efl.Gfx.Size_Hint.hint_combined_min { get; } - Efl.Gfx.Size_Hint.hint_restricted_min { get; set; } - Efl.Gfx.Size_Hint.hint_min { get; set; } - Efl.Gfx.Size_Hint.hint_max { get; set; } - Efl.Gfx.Size_Hint.hint_margin { get; set; } - Efl.Gfx.Size_Hint.hint_weight { get; set; } - Efl.Gfx.Size_Hint.hint_fill { get; set; } + Efl.Gfx.Hint.hint_aspect { get; set; } + Efl.Gfx.Hint.hint_align { get; set; } + Efl.Gfx.Hint.hint_size_combined_min { get; } + Efl.Gfx.Hint.hint_size_restricted_min { get; set; } + Efl.Gfx.Hint.hint_size_min { get; set; } + Efl.Gfx.Hint.hint_size_max { get; set; } + Efl.Gfx.Hint.hint_margin { get; set; } + Efl.Gfx.Hint.hint_weight { get; set; } + Efl.Gfx.Hint.hint_fill { get; set; } Efl.Gfx.Entity.scale { set; get; } Efl.Input.Interface.seat_event_filter { get; set; } Efl.Loop_Consumer.loop { get; } diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index fa44327564..38e81d5141 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1,5 +1,5 @@ #define EFL_CANVAS_OBJECT_PROTECTED -#define EFL_GFX_SIZE_HINT_PROTECTED +#define EFL_GFX_HINT_PROTECTED #include "evas_common_private.h" #include "evas_private.h" @@ -322,7 +322,7 @@ _efl_canvas_object_efl_object_finalize(Eo *eo_obj, Evas_Object_Protected_Data *o if (obj->legacy.ctor) goto end; if (!obj->legacy.weight_set) - efl_gfx_size_hint_weight_set(eo_obj, 1.0, 1.0); + efl_gfx_hint_weight_set(eo_obj, 1.0, 1.0); if (obj->legacy.visible_set /* && ... */) { @@ -1636,7 +1636,7 @@ evas_object_size_hint_display_mode_set(Eo *eo_obj, Evas_Display_Mode dispmode) } EOLIAN static Eina_Size2D -_efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_hint_hint_size_restricted_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if ((!obj->size_hints) || obj->delete_me) return EINA_SIZE2D(0, 0); @@ -1645,7 +1645,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_get(const Eo *eo_obj EI } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) +_efl_canvas_object_efl_gfx_hint_hint_size_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) { if (obj->delete_me) return; @@ -1664,7 +1664,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Ob } EOLIAN static Eina_Size2D -_efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_hint_hint_size_combined_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { Eina_Size2D sz = { 0, 0 }; @@ -1677,7 +1677,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(const Eo *eo_obj EINA } EOLIAN static Eina_Size2D -_efl_canvas_object_efl_gfx_size_hint_hint_max_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_hint_hint_size_max_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if ((!obj->size_hints) || obj->delete_me) return EINA_SIZE2D(-1, -1); @@ -1686,7 +1686,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_max_get(const Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) +_efl_canvas_object_efl_gfx_hint_hint_size_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) { if (obj->delete_me) return; @@ -1741,7 +1741,7 @@ evas_object_size_hint_request_set(Eo *eo_obj, Evas_Coord w, Evas_Coord h) } EOLIAN static Eina_Size2D -_efl_canvas_object_efl_gfx_size_hint_hint_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_hint_hint_size_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if ((!obj->size_hints) || obj->delete_me) return EINA_SIZE2D(0, 0); @@ -1750,7 +1750,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_min_get(const Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) +_efl_canvas_object_efl_gfx_hint_hint_size_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) { if (obj->delete_me) return; @@ -1769,7 +1769,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protec } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect *aspect, Eina_Size2D *sz) +_efl_canvas_object_efl_gfx_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Hint_Aspect *aspect, Eina_Size2D *sz) { if ((!obj->size_hints) || obj->delete_me) { @@ -1786,7 +1786,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSE } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect aspect, Eina_Size2D sz) +_efl_canvas_object_efl_gfx_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Hint_Aspect aspect, Eina_Size2D sz) { if (obj->delete_me) return; @@ -1808,7 +1808,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Pro } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_align_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) +_efl_canvas_object_efl_gfx_hint_hint_align_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) { if ((!obj->size_hints) || obj->delete_me) { @@ -1821,7 +1821,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_align_get(const Eo *eo_obj EINA_UNUSED } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) +_efl_canvas_object_efl_gfx_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) { if (obj->delete_me) return; @@ -1843,7 +1843,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Prot } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_weight_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) +_efl_canvas_object_efl_gfx_hint_hint_weight_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) { if ((!obj->size_hints) || obj->delete_me) { @@ -1856,7 +1856,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_weight_get(const Eo *eo_obj EINA_UNUSE } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) +_efl_canvas_object_efl_gfx_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) { if (obj->delete_me) return; @@ -1879,7 +1879,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Pro } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_margin_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) +_efl_canvas_object_efl_gfx_hint_hint_margin_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) { if ((!obj->size_hints) || obj->delete_me) { @@ -1896,7 +1896,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_margin_get(const Eo *eo_obj EINA_UNUSE } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) +_efl_canvas_object_efl_gfx_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) { if (obj->delete_me) return; @@ -1918,7 +1918,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Pro } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool *x, Eina_Bool *y) +_efl_canvas_object_efl_gfx_hint_hint_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool *x, Eina_Bool *y) { if ((!obj->size_hints) || obj->delete_me) { @@ -1931,7 +1931,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_fill_get(const Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_object_efl_gfx_size_hint_hint_fill_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool x, Eina_Bool y) +_efl_canvas_object_efl_gfx_hint_hint_fill_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool x, Eina_Bool y) { if (obj->delete_me) return; @@ -2378,12 +2378,12 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); geom = efl_gfx_entity_geometry_get(eo_obj); scale = efl_gfx_entity_scale_get(eo_obj); - min = efl_gfx_size_hint_restricted_min_get(eo_obj); - max = efl_gfx_size_hint_max_get(eo_obj); - //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); - efl_gfx_size_hint_align_get(eo_obj, &dblx, &dbly); - efl_gfx_size_hint_weight_get(eo_obj, &dblw, &dblh); - efl_gfx_size_hint_fill_get(eo_obj, &fillx, &filly); + min = efl_gfx_hint_size_restricted_min_get(eo_obj); + max = efl_gfx_hint_size_max_get(eo_obj); + //efl_gfx_hint_request_get(eo_obj, &requestw, &requesth); + efl_gfx_hint_align_get(eo_obj, &dblx, &dbly); + efl_gfx_hint_weight_get(eo_obj, &dblw, &dblh); + efl_gfx_hint_fill_get(eo_obj, &fillx, &filly); efl_gfx_color_get(eo_obj, &r, &g, &b, &a); focus = evas_object_focus_get(eo_obj); m = efl_canvas_object_pointer_mode_get(eo_obj); @@ -2740,14 +2740,14 @@ evas_object_static_clip_get(const Evas_Object *eo_obj) EAPI void evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h) { - efl_gfx_size_hint_aspect_set(obj, aspect, EINA_SIZE2D(w, h)); + efl_gfx_hint_aspect_set(obj, aspect, EINA_SIZE2D(w, h)); } EAPI void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h) { Eina_Size2D sz = { 0, 0 }; - efl_gfx_size_hint_aspect_get(obj, aspect, &sz); + efl_gfx_hint_aspect_get(obj, aspect, &sz); if (w) *w = sz.w; if (h) *h = sz.h; } @@ -2755,14 +2755,14 @@ evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *as EAPI void evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { - efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(w, h)); + efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(w, h)); } EAPI void evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { Eina_Size2D sz; - sz = efl_gfx_size_hint_max_get(obj); + sz = efl_gfx_hint_size_max_get(obj); if (w) *w = sz.w; if (h) *h = sz.h; } @@ -2770,14 +2770,14 @@ evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord EAPI void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { - efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(w, h)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(w, h)); } EAPI void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { Eina_Size2D sz; - sz = efl_gfx_size_hint_restricted_min_get(obj); + sz = efl_gfx_hint_size_restricted_min_get(obj); if (w) *w = sz.w; if (h) *h = sz.h; } @@ -2785,37 +2785,37 @@ evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord EAPI void evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) { - efl_gfx_size_hint_margin_set(obj, l, r, t, b); + efl_gfx_hint_margin_set(obj, l, r, t, b); } EAPI void evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) { - efl_gfx_size_hint_margin_get(obj, l, r, t, b); + efl_gfx_hint_margin_get(obj, l, r, t, b); } EAPI void evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y) { - efl_gfx_size_hint_weight_set(obj, x, y); + efl_gfx_hint_weight_set(obj, x, y); } EAPI void evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y) { - efl_gfx_size_hint_weight_get(obj, x, y); + efl_gfx_hint_weight_get(obj, x, y); } EAPI void evas_object_size_hint_align_set(Evas_Object *obj, double x, double y) { - efl_gfx_size_hint_align_set(obj, x, y); + efl_gfx_hint_align_set(obj, x, y); } EAPI void evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y) { - efl_gfx_size_hint_align_get(obj, x, y); + efl_gfx_hint_align_get(obj, x, y); } EAPI Evas * diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index fb49c4abc4..1e304256bd 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -350,7 +350,7 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data * evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v); evas_object_size_hint_weight_get(child, &weightw, &weighth); //only for Efl.Ui.Table - efl_gfx_size_hint_fill_get(child, &fill_h, &fill_v); + efl_gfx_hint_fill_get(child, &fill_h, &fill_v); child_minw = opt->min.w + opt->pad.l + opt->pad.r; child_minh = opt->min.h + opt->pad.t + opt->pad.b; diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index 80c960bda9..06150e7cbd 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -2897,7 +2897,7 @@ evas_render_pre(Evas *eo_e, Evas_Public_Data *evas) // weight should be set during finalize() if (EINA_UNLIKELY(!obj->legacy.weight_set)) - efl_gfx_size_hint_weight_set(eo_obj, 1.0, 1.0); + efl_gfx_hint_weight_set(eo_obj, 1.0, 1.0); } eina_evlog("-render_pre_objects_finalize", eo_e, 0.0, NULL); diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py index 23f172c4c3..2a30cbeefe 100755 --- a/src/scripts/pyolian/test_eolian.py +++ b/src/scripts/pyolian/test_eolian.py @@ -477,12 +477,12 @@ class TestEolianVariable(unittest.TestCase): self.assertIsNone(var.value) # TODO is None correct here? no value? def test_variable_constant(self): - var = eolian_db.constant_by_name_get('Efl.Gfx.Size_Hint_Fill') + var = eolian_db.constant_by_name_get('Efl.Gfx.Hint_Fill') self.assertIsInstance(var, eolian.Variable) - self.assertEqual(var.name, 'Efl.Gfx.Size_Hint_Fill') + self.assertEqual(var.name, 'Efl.Gfx.Hint_Fill') self.assertEqual(var.short_name, 'Size_Hint_Fill') self.assertEqual(var.type, eolian.Eolian_Variable_Type.CONSTANT) - self.assertEqual(var.file, 'efl_gfx_size_hint.eo') + self.assertEqual(var.file, 'efl_gfx_hint.eo') self.assertFalse(var.is_extern) self.assertEqual(list(var.namespaces), ['Efl','Gfx']) self.assertIsInstance(var.documentation, eolian.Documentation) @@ -634,7 +634,7 @@ class TestEolianExpression(unittest.TestCase): self.assertEqual(exp.serialize, '100') def test_expression_unary(self): - var = eolian_db.constant_by_name_get('Efl.Gfx.Size_Hint_Fill') + var = eolian_db.constant_by_name_get('Efl.Gfx.Hint_Fill') exp = var.value self.assertIsInstance(exp, eolian.Expression) self.assertEqual(exp.type, eolian.Eolian_Expression_Type.UNARY) diff --git a/src/tests/edje/edje_test_text.c b/src/tests/edje/edje_test_text.c index c4ac3c8758..96b33b5605 100644 --- a/src/tests/edje/edje_test_text.c +++ b/src/tests/edje/edje_test_text.c @@ -122,7 +122,7 @@ START_TEST(edje_test_text_ellipsis) evas = _setup_evas(); layout = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 40))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 40))); efl_file_set(layout, test_layout_get("test_text.edj"), "test"); fail_if(efl_file_load_error_get(layout)); @@ -140,7 +140,7 @@ START_TEST(edje_test_text_wrap) evas = _setup_evas(); layout = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 40))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 40))); efl_file_set(layout, test_layout_get("test_text.edj"), "test"); fail_if(efl_file_load_error_get(layout)); @@ -158,7 +158,7 @@ START_TEST(edje_test_text_font) evas = _setup_evas(); layout = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 40))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 40))); efl_file_set(layout, test_layout_get("test_text.edj"), "test"); fail_if(efl_file_load_error_get(layout)); @@ -176,7 +176,7 @@ START_TEST(edje_test_text_color) evas = _setup_evas(); layout = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 40))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 40))); efl_file_set(layout, test_layout_get("test_text.edj"), "test"); fail_if(efl_file_load_error_get(layout)); @@ -313,7 +313,7 @@ START_TEST(edje_test_text_part) evas = _setup_evas(); layout = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, - efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 40))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 40))); efl_file_set(layout, test_layout_get("test_text.edj"), "test"); fail_if(efl_file_load_error_get(layout)); diff --git a/src/tests/elementary/efl_ui_test_box.c b/src/tests/elementary/efl_ui_test_box.c index 314a2d5007..af4eab0874 100644 --- a/src/tests/elementary/efl_ui_test_box.c +++ b/src/tests/elementary/efl_ui_test_box.c @@ -20,7 +20,7 @@ typedef struct { int marginr; int margint; int marginb; - Efl_Gfx_Size_Hint_Aspect mode; + Efl_Gfx_Hint_Aspect mode; Eina_Size2D aspect; Eina_Bool fillx; Eina_Bool filly; @@ -32,59 +32,59 @@ typedef struct { static Hint hints[] = { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(0, 0), 1, 1, 0.5, 0.5, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 200), EINA_RECT(0, 0, 200, 200), "[0]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.3, 0.5, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 200), EINA_RECT(0, 0, 200, 200), "[1]" }, { EINA_SIZE2D(50, 150), EINA_SIZE2D(70, 70), 1, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 200), EINA_RECT((200 - 70) * 0.3, (200 - 150) * 0.7, 70, 150), "[2]" }, { EINA_SIZE2D(150, -1), EINA_SIZE2D(70, 70), 0, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 200), EINA_RECT((200 - 70) * 0.3, (200 - 70) * 0.2, 70, 70), "[3]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_TRUE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 200), EINA_RECT((200 - 70) * 0.3, (200 - 70) * 0.2, 70, 70), "[4]" }, { EINA_SIZE2D(150, 150), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_TRUE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 200), EINA_RECT((200 - 70) * 0.3, (200 - 70) * 0.2, 70, 70), "[5]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 0, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 210), EINA_RECT((200 - 70) * 0.3, 0, 70, 70 * 3), "[6]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 0, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(300, 300), EINA_SIZE2D(300, 300), EINA_RECT((300 - 70) * 0.3, (300 - 70 * 3) * 0.7, 70, 70 * 3), "[7]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 210), EINA_RECT((200 - 70) * 0.3, 0, 70, 70 * 3), "[8]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(300, 300), EINA_SIZE2D(300, 300), EINA_RECT((300 - 70) * 0.3, (300 - 70 * 3) * 0.2, 70, 70 * 3), "[9]" }, { EINA_SIZE2D(-1, 150), EINA_SIZE2D(70, 70), 0, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 210), EINA_RECT((200 - 70) * 0.3, 0, 70, 70 * 3), "[10]" }, { EINA_SIZE2D(-1, 150), EINA_SIZE2D(70, 70), 0, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(300, 300), EINA_SIZE2D(300, 300), EINA_RECT((300 - 70) * 0.3, (300 - 70 * 3) * 0.7, 70, 70 * 3), "[11]" }, { EINA_SIZE2D(-1, 150), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(200, 200), EINA_SIZE2D(200, 210), EINA_RECT((200 - 70) * 0.3, 0, 70, 70 * 3), "[12]" }, { EINA_SIZE2D(-1, 150), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(300, 300), EINA_SIZE2D(300, 300), EINA_RECT((300 - 70) * 0.3, (300 - 70 * 3) * 0.2, 70, 70 * 3), "[13]" }, }; @@ -92,31 +92,31 @@ static Hint hints[] = { static Hint hints2[][2] = { { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT((150 - 70) * 0.3, (150 - 70) * 0.7, 70, 70), "[1/1 weight btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT((150 - 70) * 0.8, (150 - 70) * 0.2 + 150, 70, 70), "[1/1 weight btn2]" } }, { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT((150 - 70) * 0.3, 0, 70, 70), "[0/1 weight btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_VERTICAL, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_VERTICAL, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT((150 - ((300 - 70) / 3)) * 0.8, 70, (300 - 70) / 3, (300 - 70)), "[0/1 weight btn2]" } }, { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 0, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_FALSE, EINA_FALSE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT((150 - 70) * 0.3, (300 - 280) * 0.2, 70, 70), "[0/0 weight btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 0, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_HORIZONTAL, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, + EFL_GFX_HINT_ASPECT_HORIZONTAL, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_FALSE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT((150 - 70) * 0.8, (300 - 280) * 0.2 + 70, 70, 70 * 3), "[0/0 weight btn2]" } }, @@ -125,57 +125,57 @@ static Hint hints2[][2] = { static Hint hints3[][3] = { { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT(0, 0, 150, 100), "[1/1/1 weight_l btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 100), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT(0, 100, 150, 100), "[1/1/1 weight_l btn2]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 300), EINA_SIZE2D(150, 300), EINA_RECT(0, 100 + 100, 150, 100), "[1/1/1 weight_l btn3]" } }, { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 270), EINA_SIZE2D(150, 270), EINA_RECT(0, 0, 150, 85), "[1/1/1 weight_m btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 100), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 270), EINA_SIZE2D(150, 270), EINA_RECT(0, 85, 150, 100), "[1/1/1 weight_m btn2]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 270), EINA_SIZE2D(150, 270), EINA_RECT(0, 100 + 85, 150, 85), "[1/1/1 weight_m btn3]" } }, { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.3, 0.7, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 200), EINA_SIZE2D(150, 240), EINA_RECT(0, 0, 150, 70), "[1/1/1 weight_s btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 100), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 200), EINA_SIZE2D(150, 240), EINA_RECT(0, 70, 150, 100), "[1/1/1 weight_s btn2]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(70, 70), 1, 1, 0.8, 0.2, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_NONE, EINA_SIZE2D(0, 0), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(150, 200), EINA_SIZE2D(150, 240), EINA_RECT(0, 170, 150, 70), "[1/1/1 weight_s btn3]" } }, { { EINA_SIZE2D(-1, -1), EINA_SIZE2D(0, 0), 1, 1, 0.5, 0.5, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(300, 900), EINA_SIZE2D(300, 900), EINA_RECT(100, 0, 100, 300), "[aspect resize btn]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(0, 0), 1, 1, 0.5, 0.5, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(300, 900), EINA_SIZE2D(300, 900), EINA_RECT(100, 300, 100, 300), "[aspect resize btn2]" }, { EINA_SIZE2D(-1, -1), EINA_SIZE2D(0, 0), 1, 1, 0.5, 0.5, 0, 0, 0, 0, - EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, + EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 3), EINA_TRUE, EINA_TRUE, EINA_SIZE2D(300, 900), EINA_SIZE2D(300, 900), EINA_RECT(100, 300 + 300, 100, 300), "[aspect resize btn3]" } }, @@ -187,12 +187,12 @@ static void btn_hint_set(Eo *btn, Hint *hint) { efl_gfx_entity_size_set(layout, hint->layout_size); - efl_gfx_size_hint_max_set(btn, hint->max); - efl_gfx_size_hint_min_set(btn, hint->min); - efl_gfx_size_hint_weight_set(btn, hint->weightx, hint->weighty); - efl_gfx_size_hint_align_set(btn, hint->alignx, hint->aligny); - efl_gfx_size_hint_fill_set(btn, hint->fillx, hint->filly); - efl_gfx_size_hint_aspect_set(btn, hint->mode, hint->aspect); + efl_gfx_hint_size_max_set(btn, hint->max); + efl_gfx_hint_size_min_set(btn, hint->min); + efl_gfx_hint_weight_set(btn, hint->weightx, hint->weighty); + efl_gfx_hint_align_set(btn, hint->alignx, hint->aligny); + efl_gfx_hint_fill_set(btn, hint->fillx, hint->filly); + efl_gfx_hint_aspect_set(btn, hint->mode, hint->aspect); efl_canvas_group_calculate(layout); } @@ -202,7 +202,7 @@ btn_geom_assert(Hint *hint, Eina_Rect btn_geom) Eina_Size2D layout_size, layout_min; layout_size = efl_gfx_entity_size_get(layout); - layout_min = efl_gfx_size_hint_min_get(layout); + layout_min = efl_gfx_hint_size_min_get(layout); layout_size.w = layout_size.w > layout_min.w ? layout_size.w : layout_min.w; layout_size.h = layout_size.h > layout_min.h ? layout_size.h : layout_min.h;