summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-02-25 13:21:44 +0900
committerHermet Park <hermetpark@gmail.com>2019-02-25 13:21:44 +0900
commit11fb20f40ae589fff71f44b997ea292a5ebdd311 (patch)
tree4d2c96d1bd3ab2c5b803db4d76147d61262ab6b4 /src
parent6895d3ff2c95fd9f66d4c03693c04d781c1f74cd (diff)
parenta2cfa9340a4650eae965a920788c0edd1141cfe4 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Efl.am3
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/Makefile_Elua.am5
-rw-r--r--src/Makefile_Eolian.am1
-rw-r--r--src/Makefile_Evas.am4
-rw-r--r--src/bin/edje/meson.build2
-rw-r--r--src/bin/elementary/meson.build10
-rw-r--r--src/bin/elementary/perf.c4
-rw-r--r--src/bin/elementary/test.c7
-rw-r--r--src/bin/elementary/test_anim.c2
-rw-r--r--src/bin/elementary/test_bg.c34
-rw-r--r--src/bin/elementary/test_box.c4
-rw-r--r--src/bin/elementary/test_efl_gfx_mapping.c (renamed from src/bin/elementary/test_efl_gfx_map.c)40
-rw-r--r--src/bin/elementary/test_efl_ui_text.c20
-rw-r--r--src/bin/elementary/test_evas_map.c2
-rw-r--r--src/bin/elementary/test_evas_mask.c20
-rw-r--r--src/bin/elementary/test_evas_snapshot.c22
-rw-r--r--src/bin/elementary/test_flip_page_eo.c40
-rw-r--r--src/bin/elementary/test_gfx_filters.c58
-rw-r--r--src/bin/elementary/test_part_bg.c12
-rw-r--r--src/bin/elementary/test_part_shadow.c12
-rw-r--r--src/bin/elementary/test_photocam.c6
-rw-r--r--src/bin/elementary/test_ui_box.c196
-rw-r--r--src/bin/elementary/test_ui_clock.c26
-rw-r--r--src/bin/elementary/test_ui_pager.c22
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c28
-rw-r--r--src/bin/elementary/test_ui_panel.c10
-rw-r--r--src/bin/elementary/test_ui_panes.c6
-rw-r--r--src/bin/elementary/test_ui_popup.c22
-rw-r--r--src/bin/elementary/test_ui_progressbar.c4
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c319
-rw-r--r--src/bin/elementary/test_ui_scroller.c32
-rw-r--r--src/bin/elementary/test_ui_slider.c22
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c12
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c16
-rw-r--r--src/bin/elementary/test_ui_table.c202
-rw-r--r--src/bin/elementary/test_ui_textpath.c28
-rw-r--r--src/bin/elementary/test_win_dialog.c34
-rw-r--r--src/bin/elementary/test_win_indicator.c8
-rw-r--r--src/bin/elementary/test_win_inline.c2
-rw-r--r--src/bin/elua/meson.build1
-rw-r--r--src/bin/eolian/docs.c7
-rw-r--r--src/bin/eolian/main.c37
-rw-r--r--src/bin/eolian/sources.c23
-rw-r--r--src/bin/eolian/sources.h2
-rw-r--r--src/bin/eolian_mono/eolian/mono/documentation.hh23
-rw-r--r--src/bin/eolian_mono/eolian/mono/events.hh2
-rw-r--r--src/bindings/luajit/eolian.lua42
-rw-r--r--src/examples/elementary.mk8
-rw-r--r--src/examples/elementary/.gitignore2
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc12
-rw-r--r--src/examples/elementary/efl_ui_grid_example_1.c8
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c36
-rw-r--r--src/examples/elementary/efl_ui_list_view_example_3.c2
-rw-r--r--src/examples/elementary/efl_ui_relative_layout_example_01.c51
-rw-r--r--src/examples/elementary/efl_ui_relative_layout_example_02.c45
-rw-r--r--src/examples/elementary/efl_ui_theme_example_01.c4
-rw-r--r--src/examples/elementary/efl_ui_theme_example_02.c4
-rw-r--r--src/examples/elementary/layout_property_bind.c10
-rw-r--r--src/examples/elementary/meson.build164
-rw-r--r--src/examples/elementary/performance/meson.build31
-rw-r--r--src/examples/elementary/slider_cxx_example.cc6
-rw-r--r--src/examples/elementary/sphere_hunter/meson.build31
-rw-r--r--src/examples/elementary/table_cxx_example_02.cc8
-rw-r--r--src/examples/evas/evas-hints.c2
-rw-r--r--src/examples/evas/evas-map-aa-eo.c18
-rw-r--r--src/examples/evas/evas-map-utils-eo.c72
-rw-r--r--src/examples/evas/evas_mono_table.cs8
-rw-r--r--src/lib/ecore/ecore_event_message_handler.c8
-rw-r--r--src/lib/ecore/ecore_events.c6
-rw-r--r--src/lib/ecore/ecore_private.h8
-rw-r--r--src/lib/ecore/ecore_time.c2
-rw-r--r--src/lib/ecore/efl_app.c5
-rw-r--r--src/lib/ecore/efl_app.eo6
-rw-r--r--src/lib/ecore/efl_appthread.c4
-rw-r--r--src/lib/ecore/efl_composite_model.c9
-rw-r--r--src/lib/ecore/efl_exe.c4
-rw-r--r--src/lib/ecore/efl_io_buffered_stream.c4
-rw-r--r--src/lib/ecore/efl_io_reader_fd.c2
-rw-r--r--src/lib/ecore/efl_io_writer_fd.c2
-rw-r--r--src/lib/ecore/efl_loop.c34
-rw-r--r--src/lib/ecore/efl_loop.eo36
-rw-r--r--src/lib/ecore/efl_loop_model.c27
-rw-r--r--src/lib/ecore/efl_loop_model.eo11
-rw-r--r--src/lib/ecore/efl_loop_timer.eo37
-rw-r--r--src/lib/ecore/efl_select_model.c35
-rw-r--r--src/lib/ecore/efl_thread.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_udp_client.c4
-rw-r--r--src/lib/ecore_con/efl_net_socket_ssl.c4
-rw-r--r--src/lib/ecore_con/efl_net_socket_windows.c4
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_fb.c30
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_outputs.c2
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_private.h2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c10
-rw-r--r--src/lib/ecore_imf/Ecore_IMF.h2
-rw-r--r--src/lib/ecore_imf_evas/ecore_imf_evas.c2
-rw-r--r--src/lib/edje/edje_calc.c8
-rw-r--r--src/lib/edje/edje_load.c2
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/edje/meson.build7
-rw-r--r--src/lib/efl/Efl.h5
-rw-r--r--src/lib/efl/interfaces/efl_animator.eo15
-rw-r--r--src/lib/efl/interfaces/efl_canvas_scene.eo44
-rw-r--r--src/lib/efl/interfaces/efl_gfx_entity.eo6
-rw-r--r--src/lib/efl/interfaces/efl_gfx_hint.eo (renamed from src/lib/efl/interfaces/efl_gfx_size_hint.eo)40
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot4
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c3
-rw-r--r--src/lib/efl/interfaces/efl_io_buffer.c4
-rw-r--r--src/lib/efl/interfaces/efl_io_queue.c4
-rw-r--r--src/lib/efl/interfaces/efl_io_reader.eo2
-rw-r--r--src/lib/efl/interfaces/efl_io_writer.eo2
-rw-r--r--src/lib/efl/interfaces/efl_model.eo4
-rw-r--r--src/lib/efl/interfaces/efl_screen.eo36
-rw-r--r--src/lib/efl/interfaces/meson.build3
-rw-r--r--src/lib/eio/efl_io_model.c117
-rw-r--r--src/lib/eio/eio_dir.c100
-rw-r--r--src/lib/elementary/Efl_Ui.h1
-rw-r--r--src/lib/elementary/Elementary.h1
-rw-r--r--src/lib/elementary/efl_page_indicator_icon.c12
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c8
-rw-r--r--src/lib/elementary/efl_ui_anchor_popup.c14
-rw-r--r--src/lib/elementary/efl_ui_average_model.c12
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c28
-rw-r--r--src/lib/elementary/efl_ui_box_stack.c6
-rw-r--r--src/lib/elementary/efl_ui_cursor.eo88
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c34
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.eo11
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.eo117
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c26
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_sub.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_object.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_object.eo48
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.c6
-rw-r--r--src/lib/elementary/efl_ui_focus_util.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c36
-rw-r--r--src/lib/elementary/efl_ui_image.c6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c18
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c78
-rw-r--r--src/lib/elementary/efl_ui_layout_part.eo7
-rw-r--r--src/lib/elementary/efl_ui_list.c22
-rw-r--r--src/lib/elementary/efl_ui_list_view.c7
-rw-r--r--src/lib/elementary/efl_ui_list_view_precise_layouter.c18
-rw-r--r--src/lib/elementary/efl_ui_pager.c20
-rw-r--r--src/lib/elementary/efl_ui_panes.c12
-rw-r--r--src/lib/elementary/efl_ui_panes_part.eo4
-rw-r--r--src/lib/elementary/efl_ui_popup.c10
-rw-r--r--src/lib/elementary/efl_ui_relative_layout.c552
-rw-r--r--src/lib/elementary/efl_ui_relative_layout.eo79
-rw-r--r--src/lib/elementary/efl_ui_relative_layout_private.h90
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c6
-rw-r--r--src/lib/elementary/efl_ui_scroller.c22
-rw-r--r--src/lib/elementary/efl_ui_slider.c4
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_table.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.c48
-rw-r--r--src/lib/elementary/efl_ui_text.c12
-rw-r--r--src/lib/elementary/efl_ui_text_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_textpath.c6
-rw-r--r--src/lib/elementary/efl_ui_widget.c20
-rw-r--r--src/lib/elementary/efl_ui_widget.eo70
-rw-r--r--src/lib/elementary/efl_ui_win.c76
-rw-r--r--src/lib/elementary/efl_ui_win.eo34
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c4
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_cursor.h121
-rw-r--r--src/lib/elementary/elm_focus_legacy.c12
-rw-r--r--src/lib/elementary/elm_gengrid.c11
-rw-r--r--src/lib/elementary/elm_gengrid.eo1
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c10
-rw-r--r--src/lib/elementary/elm_genlist_item.eo2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c6
-rw-r--r--src/lib/elementary/elm_main.c45
-rw-r--r--src/lib/elementary/elm_map.c6
-rw-r--r--src/lib/elementary/elm_scroller.c2
-rw-r--r--src/lib/elementary/elm_toolbar.c4
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus.c10
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus.eo2
-rw-r--r--src/lib/elementary/els_cursor.c14
-rw-r--r--src/lib/elementary/meson.build8
-rw-r--r--src/lib/elua/meson.build13
-rw-r--r--src/lib/eo/Eo.h28
-rw-r--r--src/lib/eo/eo.c58
-rw-r--r--src/lib/eo/eo_internal.h9
-rw-r--r--src/lib/eolian/Eolian.h4
-rw-r--r--src/lib/eolian/database_validate.c2
-rw-r--r--src/lib/eolian/eo_lexer.c2
-rw-r--r--src/lib/eolian/eo_lexer.h2
-rw-r--r--src/lib/eolian/eo_parser.c3
-rw-r--r--src/lib/evas/Evas_Common.h12
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Internal.h2
-rw-r--r--src/lib/evas/Evas_Legacy.h24
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_alpha.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo29
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c4
-rw-r--r--src/lib/evas/canvas/efl_gfx_mapping.c (renamed from src/lib/evas/canvas/efl_gfx_map.c)236
-rw-r--r--src/lib/evas/canvas/efl_gfx_mapping.eo (renamed from src/lib/evas/canvas/efl_gfx_map.eo)32
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c31
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo4
-rw-r--r--src/lib/evas/canvas/evas_device.c31
-rw-r--r--src/lib/evas/canvas/evas_main.c4
-rw-r--r--src/lib/evas/canvas/evas_map.h2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c3
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c25
-rw-r--r--src/lib/evas/canvas/evas_object_main.c74
-rw-r--r--src/lib/evas/canvas/evas_object_table.c4
-rw-r--r--src/lib/evas/canvas/evas_render.c14
-rw-r--r--src/lib/evas/canvas/meson.build4
-rw-r--r--src/lib/evas/filters/meson.build35
-rw-r--r--src/lib/evas/include/evas_inline.x6
-rw-r--r--src/lib/evas/include/evas_private.h12
-rw-r--r--src/lib/evas/vg/evas_vg_cache.c4
-rw-r--r--src/lib/evas_goal/meson.build4
-rwxr-xr-xsrc/scripts/pyolian/test_eolian.py8
-rw-r--r--src/tests/ecore/efl_app_test_loop.c5
-rw-r--r--src/tests/edje/edje_test_text.c10
-rw-r--r--src/tests/efl/efl_test_container_model.c4
-rw-r--r--src/tests/efl_mono/Events.cs23
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo7
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.c5
-rw-r--r--src/tests/eio/efl_io_model_test_monitor_add.c64
-rw-r--r--src/tests/elementary/efl_ui_suite.c1
-rw-r--r--src/tests/elementary/efl_ui_suite.h1
-rw-r--r--src/tests/elementary/efl_ui_test_box.c80
-rw-r--r--src/tests/elementary/efl_ui_test_focus_sub.c4
-rw-r--r--src/tests/elementary/efl_ui_test_relative_layout.c300
-rw-r--r--src/tests/elementary/elm_test_win.c6
-rw-r--r--src/tests/elementary/meson.build1
-rw-r--r--src/tests/elementary/suite_helpers.c5
-rw-r--r--src/tests/elua/elua_lib.c6
-rw-r--r--src/tests/eo/interface/interface_main.c2
-rw-r--r--src/tests/eo/mixin/mixin_main.c3
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c8
-rw-r--r--src/tests/eo/suite/eo_test_reflection.c10
-rw-r--r--src/tests/eolian/data/class_simple_ref.c24
-rw-r--r--src/tests/eolian/data/class_simple_ref.legacy.c12
-rw-r--r--src/tests/eolian/data/complex_type.eo1
-rw-r--r--src/tests/eolian/eolian_generation.c1
-rw-r--r--src/tests/eolian/eolian_parsing.c17
257 files changed, 4170 insertions, 1868 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index c7f66ebd02..f82bfb1ac2 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -354,7 +354,7 @@ tests/ecore/efl_app_test_env.c \
354tests/ecore/efl_app_suite.c \ 354tests/ecore/efl_app_suite.c \
355tests/ecore/efl_app_suite.h 355tests/ecore/efl_app_suite.h
356 356
357tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 357tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/tests/ecore \
358-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ 358-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
359-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \ 359-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
360-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \ 360-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index b364beeab4..d254f6f8a1 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -47,9 +47,8 @@ efl_eolian_files = \
47 lib/efl/interfaces/efl_gfx_gradient_radial.eo \ 47 lib/efl/interfaces/efl_gfx_gradient_radial.eo \
48 lib/efl/interfaces/efl_gfx_filter.eo \ 48 lib/efl/interfaces/efl_gfx_filter.eo \
49 lib/efl/interfaces/efl_gfx_blur.eo \ 49 lib/efl/interfaces/efl_gfx_blur.eo \
50 lib/efl/interfaces/efl_gfx_size_hint.eo \ 50 lib/efl/interfaces/efl_gfx_hint.eo \
51 lib/efl/interfaces/efl_model.eo \ 51 lib/efl/interfaces/efl_model.eo \
52 lib/efl/interfaces/efl_animator.eo \
53 lib/efl/interfaces/efl_orientation.eo \ 52 lib/efl/interfaces/efl_orientation.eo \
54 lib/efl/interfaces/efl_container.eo \ 53 lib/efl/interfaces/efl_container.eo \
55 lib/efl/interfaces/efl_content.eo \ 54 lib/efl/interfaces/efl_content.eo \
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 76e363e7a6..dbd6243c65 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -59,7 +59,6 @@ elm_public_eolian_files = \
59 lib/elementary/efl_ui_textpath_legacy.eo \ 59 lib/elementary/efl_ui_textpath_legacy.eo \
60 lib/elementary/efl_ui_l10n.eo \ 60 lib/elementary/efl_ui_l10n.eo \
61 lib/elementary/efl_ui_clock.eo \ 61 lib/elementary/efl_ui_clock.eo \
62 lib/elementary/efl_ui_cursor.eo \
63 lib/elementary/efl_ui_image_factory.eo \ 62 lib/elementary/efl_ui_image_factory.eo \
64 lib/elementary/efl_ui_focus_manager.eo \ 63 lib/elementary/efl_ui_focus_manager.eo \
65 lib/elementary/efl_ui_focus_manager_calc.eo \ 64 lib/elementary/efl_ui_focus_manager_calc.eo \
@@ -134,6 +133,7 @@ elm_public_eolian_files = \
134 lib/elementary/efl_ui_text_part.eo \ 133 lib/elementary/efl_ui_text_part.eo \
135 lib/elementary/efl_ui_caching_factory.eo \ 134 lib/elementary/efl_ui_caching_factory.eo \
136 lib/elementary/efl_ui_widget_factory.eo \ 135 lib/elementary/efl_ui_widget_factory.eo \
136 lib/elementary/efl_ui_relative_layout.eo \
137 $(NULL) 137 $(NULL)
138 138
139# More public files -- FIXME 139# More public files -- FIXME
@@ -458,7 +458,8 @@ includesunstable_HEADERS = \
458 lib/elementary/efl_page_indicator_icon.h \ 458 lib/elementary/efl_page_indicator_icon.h \
459 lib/elementary/efl_ui_tab_pager_private.h \ 459 lib/elementary/efl_ui_tab_pager_private.h \
460 lib/elementary/efl_ui_tab_bar_private.h \ 460 lib/elementary/efl_ui_tab_bar_private.h \
461 lib/elementary/efl_ui_tab_page_private.h 461 lib/elementary/efl_ui_tab_page_private.h \
462 lib/elementary/efl_ui_relative_layout_private.h
462includesunstabledir = $(includedir)/elementary-@VMAJ@ 463includesunstabledir = $(includedir)/elementary-@VMAJ@
463 464
464nodist_includesunstable_HEADERS = \ 465nodist_includesunstable_HEADERS = \
@@ -901,6 +902,7 @@ lib_elementary_libelementary_la_SOURCES = \
901 lib/elementary/efl_ui_homogeneous_model.c \ 902 lib/elementary/efl_ui_homogeneous_model.c \
902 lib/elementary/efl_ui_exact_model.c \ 903 lib/elementary/efl_ui_exact_model.c \
903 lib/elementary/efl_ui_average_model.c \ 904 lib/elementary/efl_ui_average_model.c \
905 lib/elementary/efl_ui_relative_layout.c \
904 $(NULL) 906 $(NULL)
905 907
906 908
@@ -1011,7 +1013,7 @@ bin/elementary/test_entry_anchor2.c \
1011bin/elementary/test_events.c \ 1013bin/elementary/test_events.c \
1012bin/elementary/test_evas_mask.c \ 1014bin/elementary/test_evas_mask.c \
1013bin/elementary/test_evas_map.c \ 1015bin/elementary/test_evas_map.c \
1014bin/elementary/test_efl_gfx_map.c \ 1016bin/elementary/test_efl_gfx_mapping.c \
1015bin/elementary/test_evas_snapshot.c \ 1017bin/elementary/test_evas_snapshot.c \
1016bin/elementary/test_external.c \ 1018bin/elementary/test_external.c \
1017bin/elementary/test_fileselector_button.c \ 1019bin/elementary/test_fileselector_button.c \
@@ -1119,6 +1121,7 @@ bin/elementary/test_gesture_framework.c \
1119bin/elementary/test_ui_tab_pager.c \ 1121bin/elementary/test_ui_tab_pager.c \
1120bin/elementary/test_ui_pager.c \ 1122bin/elementary/test_ui_pager.c \
1121bin/elementary/test_ui_pager_scroll.c \ 1123bin/elementary/test_ui_pager_scroll.c \
1124bin/elementary/test_ui_relative_layout.c \
1122bin/elementary/test.h 1125bin/elementary/test.h
1123 1126
1124bin_elementary_elementary_test_LDADD = @USE_ELEMENTARY_LIBS@ 1127bin_elementary_elementary_test_LDADD = @USE_ELEMENTARY_LIBS@
@@ -1628,6 +1631,7 @@ tests_elementary_efl_ui_suite_SOURCES = \
1628 tests/elementary/efl_ui_test_focus.c \ 1631 tests/elementary/efl_ui_test_focus.c \
1629 tests/elementary/efl_ui_test_focus_sub.c \ 1632 tests/elementary/efl_ui_test_focus_sub.c \
1630 tests/elementary/efl_ui_test_box.c \ 1633 tests/elementary/efl_ui_test_box.c \
1634 tests/elementary/efl_ui_test_relative_layout.c \
1631 tests/elementary/efl_ui_test_grid.c \ 1635 tests/elementary/efl_ui_test_grid.c \
1632 tests/elementary/efl_ui_test_image.c \ 1636 tests/elementary/efl_ui_test_image.c \
1633 tests/elementary/efl_ui_test_image_zoomable.c \ 1637 tests/elementary/efl_ui_test_image_zoomable.c \
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index bc2513f903..5b1004b884 100644
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -123,13 +123,14 @@ tests/elua/elua_suite.c \
123tests/elua/elua_suite.h 123tests/elua/elua_suite.h
124 124
125tests_elua_elua_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 125tests_elua_elua_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
126-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elua\" \ 126-DTESTS_BUILD_DIR=\"$(abs_top_builddir)/src/tests/elua\" \
127-DTESTS_SRC_DIR=\"$(abs_top_srcdir)/src/tests/elua\" \
127-DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/elua\" \ 128-DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/elua\" \
128-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ 129-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
129-DELUA_BINDINGS_DIR=\"$(ELUA_BINDINGS_DIR)\" \ 130-DELUA_BINDINGS_DIR=\"$(ELUA_BINDINGS_DIR)\" \
130-DELUA_CORE_DIR=\"$(ELUA_CORE_DIR)\" \ 131-DELUA_CORE_DIR=\"$(ELUA_CORE_DIR)\" \
131-DELUA_MODULES_DIR=\"$(ELUA_MODULES_DIR)\" \ 132-DELUA_MODULES_DIR=\"$(ELUA_MODULES_DIR)\" \
132-DELUA_APPS_DIR=\"$(top_srcdir)/src/tests/elua/data/apps\" \ 133-DELUA_APPS_DIR=\"$(abs_top_srcdir)/src/tests/elua/data/apps\" \
133@CHECK_CFLAGS@ \ 134@CHECK_CFLAGS@ \
134@ELUA_CFLAGS@ 135@ELUA_CFLAGS@
135 136
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 2c8d531d9a..c3a6d7b364 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -159,6 +159,7 @@ tests/eolian/data/struct_ref.h \
159tests/eolian/data/struct_ref_stub.h \ 159tests/eolian/data/struct_ref_stub.h \
160tests/eolian/data/owning.eo.c \ 160tests/eolian/data/owning.eo.c \
161tests/eolian/data/class_simple_ref.c \ 161tests/eolian/data/class_simple_ref.c \
162tests/eolian/data/class_simple_ref.legacy.c \
162tests/eolian/data/override_ref.c \ 163tests/eolian/data/override_ref.c \
163tests/eolian/data/class_simple_ref_eo.h \ 164tests/eolian/data/class_simple_ref_eo.h \
164tests/eolian/data/class_simple_ref_legacy.h \ 165tests/eolian/data/class_simple_ref_legacy.h \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 62d7de5f3d..3292170bd0 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -42,7 +42,7 @@ evas_canvas_eolian_pub_files = \
42 lib/evas/canvas/efl_input_pointer.eo \ 42 lib/evas/canvas/efl_input_pointer.eo \
43 lib/evas/canvas/efl_input_hold.eo \ 43 lib/evas/canvas/efl_input_hold.eo \
44 lib/evas/canvas/efl_input_focus.eo \ 44 lib/evas/canvas/efl_input_focus.eo \
45 lib/evas/canvas/efl_gfx_map.eo \ 45 lib/evas/canvas/efl_gfx_mapping.eo \
46 lib/evas/canvas/efl_canvas_animation.eo \ 46 lib/evas/canvas/efl_canvas_animation.eo \
47 lib/evas/canvas/efl_canvas_animation_alpha.eo \ 47 lib/evas/canvas/efl_canvas_animation_alpha.eo \
48 lib/evas/canvas/efl_canvas_animation_rotate.eo \ 48 lib/evas/canvas/efl_canvas_animation_rotate.eo \
@@ -264,7 +264,7 @@ lib/evas/canvas/efl_canvas_surface.c \
264lib/evas/canvas/efl_canvas_surface_tbm.c \ 264lib/evas/canvas/efl_canvas_surface_tbm.c \
265lib/evas/canvas/efl_canvas_surface_x11.c \ 265lib/evas/canvas/efl_canvas_surface_x11.c \
266lib/evas/canvas/efl_canvas_surface_wayland.c \ 266lib/evas/canvas/efl_canvas_surface_wayland.c \
267lib/evas/canvas/efl_gfx_map.c \ 267lib/evas/canvas/efl_gfx_mapping.c \
268lib/evas/canvas/efl_input_event.c \ 268lib/evas/canvas/efl_input_event.c \
269lib/evas/canvas/efl_input_key.c \ 269lib/evas/canvas/efl_input_key.c \
270lib/evas/canvas/efl_input_pointer.c \ 270lib/evas/canvas/efl_input_pointer.c \
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 89d6382fae..9269d3338d 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -2,7 +2,7 @@ subdir('epp')
2 2
3edje_bin_deps = [ 3edje_bin_deps = [
4 eina, eo, efl, m, 4 eina, eo, efl, m,
5 luajit, eet, evas, 5 lua, eet, evas,
6 ecore_file, ecore_input, 6 ecore_file, ecore_input,
7 ecore_imf, ecore_imf_evas, 7 ecore_imf, ecore_imf_evas,
8 embryo, efreet, eio, 8 embryo, efreet, eio,
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index 030c050ec3..a3a570a25c 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -47,7 +47,7 @@ elementary_test_src = [
47 'test_events.c', 47 'test_events.c',
48 'test_evas_mask.c', 48 'test_evas_mask.c',
49 'test_evas_map.c', 49 'test_evas_map.c',
50 'test_efl_gfx_map.c', 50 'test_efl_gfx_mapping.c',
51 'test_evas_snapshot.c', 51 'test_evas_snapshot.c',
52 'test_external.c', 52 'test_external.c',
53 'test_fileselector_button.c', 53 'test_fileselector_button.c',
@@ -155,6 +155,7 @@ elementary_test_src = [
155 'test_win_indicator.c', 155 'test_win_indicator.c',
156 'test_gesture_framework.c', 156 'test_gesture_framework.c',
157 'test_ui_tab_pager.c', 157 'test_ui_tab_pager.c',
158 'test_ui_relative_layout.c',
158 'test.h' 159 'test.h'
159] 160]
160 161
@@ -214,6 +215,13 @@ elementary_codegen = executable('elementary_codegen',
214 link_args: link_args 215 link_args: link_args
215) 216)
216 217
218if meson.is_cross_build()
219 elementary_codegen_exe = [find_program('elementary_codegen', native: true)]
220else
221 env = find_program('env', native: true)
222 elementary_codegen_exe = [env, 'EFL_RUN_IN_TREE=1', elementary_codegen.full_path()]
223endif
224
217elm_prefs_cc_src = [ 225elm_prefs_cc_src = [
218 'elm_prefs_cc.h', 226 'elm_prefs_cc.h',
219 'elm_prefs_cc.c', 227 'elm_prefs_cc.c',
diff --git a/src/bin/elementary/perf.c b/src/bin/elementary/perf.c
index 3cca032d99..17f26b8c54 100644
--- a/src/bin/elementary/perf.c
+++ b/src/bin/elementary/perf.c
@@ -128,7 +128,7 @@ anim_tick(void *data, const Efl_Event *event EINA_UNUSED)
128 ecore_animator_del(animator); 128 ecore_animator_del(animator);
129 animator = NULL; 129 animator = NULL;
130#else 130#else
131 efl_event_callback_del(win, EFL_EVENT_ANIMATOR_TICK, anim_tick, data); 131 efl_event_callback_del(win, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, anim_tick, data);
132#endif 132#endif
133 ecore_timer_add(0.5, next_test_delay, data); 133 ecore_timer_add(0.5, next_test_delay, data);
134 } 134 }
@@ -168,7 +168,7 @@ all_tests(Evas *e)
168#ifdef ANIMATOR 168#ifdef ANIMATOR
169 animator = ecore_animator_add(anim_tick, e); 169 animator = ecore_animator_add(anim_tick, e);
170#else 170#else
171 efl_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, anim_tick, e); 171 efl_event_callback_add(win, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, anim_tick, e);
172#endif 172#endif
173} 173}
174 174
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index c0a2cfdaac..fa2bb740b5 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -351,7 +351,7 @@ void test_evas_mask(void *data, Edje_Object *obj, void *event_info);
351void test_gfx_filters(void *data, Evas_Object *obj, void *event_info); 351void test_gfx_filters(void *data, Evas_Object *obj, void *event_info);
352void test_evas_snapshot(void *data, Evas_Object *obj, void *event_info); 352void test_evas_snapshot(void *data, Evas_Object *obj, void *event_info);
353void test_evas_map(void *data, Edje_Object *obj, void *event_info); 353void test_evas_map(void *data, Edje_Object *obj, void *event_info);
354void test_efl_gfx_map(void *data, Edje_Object *obj, void *event_info); 354void test_efl_gfx_mapping(void *data, Edje_Object *obj, void *event_info);
355void test_ui_textpath(void *data, Edje_Object *obj, void *event_info); 355void test_ui_textpath(void *data, Edje_Object *obj, void *event_info);
356 356
357void test_efl_anim_alpha(void *data, Evas_Object *obj, void *event_info); 357void test_efl_anim_alpha(void *data, Evas_Object *obj, void *event_info);
@@ -377,6 +377,8 @@ void test_ui_tab_pager(void *data, Evas_Object *obj, void *event_info);
377void test_ui_pager(void *data, Evas_Object *obj, void *event_info); 377void test_ui_pager(void *data, Evas_Object *obj, void *event_info);
378void test_ui_pager_scroll(void *data, Evas_Object *obj, void *event_info); 378void test_ui_pager_scroll(void *data, Evas_Object *obj, void *event_info);
379 379
380void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info);
381
380static void _list_udpate(void); 382static void _list_udpate(void);
381 383
382static Evas_Object *win, *tbx, *entry; // TODO: refactoring 384static Evas_Object *win, *tbx, *entry; // TODO: refactoring
@@ -842,6 +844,7 @@ add_tests:
842 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table", test_ui_table); 844 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table", test_ui_table);
843 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear); 845 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear);
844 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static); 846 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static);
847 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Layout", test_ui_relative_layout);
845 848
846 //------------------------------// 849 //------------------------------//
847 ADD_TEST_EO(NULL, "Events", "Event Refeed", test_events); 850 ADD_TEST_EO(NULL, "Events", "Event Refeed", test_events);
@@ -1210,7 +1213,7 @@ add_tests:
1210 ADD_TEST(NULL, "Evas", "Gfx Filters", test_gfx_filters); 1213 ADD_TEST(NULL, "Evas", "Gfx Filters", test_gfx_filters);
1211 ADD_TEST(NULL, "Evas", "Snapshot", test_evas_snapshot); 1214 ADD_TEST(NULL, "Evas", "Snapshot", test_evas_snapshot);
1212 ADD_TEST(NULL, "Evas", "Map", test_evas_map); 1215 ADD_TEST(NULL, "Evas", "Map", test_evas_map);
1213 ADD_TEST_EO(NULL, "Evas", "Efl.Gfx.Map", test_efl_gfx_map); 1216 ADD_TEST_EO(NULL, "Evas", "Efl.Gfx.Mapping", test_efl_gfx_mapping);
1214 1217
1215 //------------------------------// 1218 //------------------------------//
1216 ADD_TEST(NULL, "Widgets Disable/Enable", "Box", test_box_disable); 1219 ADD_TEST(NULL, "Widgets Disable/Enable", "Box", test_box_disable);
diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index 4bcf1581ab..caad01431f 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/test_anim.c
@@ -92,5 +92,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
92 evas_object_resize(win, 480, 800); 92 evas_object_resize(win, 480, 800);
93 evas_object_show(win); 93 evas_object_show(win);
94 94
95 efl_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL); 95 efl_event_callback_add(win, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
96} 96}
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
337 337
338 box = efl_add(EFL_UI_BOX_CLASS, win, 338 box = efl_add(EFL_UI_BOX_CLASS, win,
339 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 339 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
340 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 340 efl_gfx_hint_weight_set(efl_added, 1, 1),
341 efl_content_set(win, efl_added)); 341 efl_content_set(win, efl_added));
342 342
343 cs = elm_colorselector_add(win); 343 cs = elm_colorselector_add(win);
@@ -354,16 +354,16 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
354 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 354 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
355 efl_add(EFL_UI_IMAGE_CLASS, win, 355 efl_add(EFL_UI_IMAGE_CLASS, win,
356 efl_file_set(efl_added, buf, NULL), 356 efl_file_set(efl_added, buf, NULL),
357 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), 357 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
358 efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), 358 efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
359 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win), 359 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win),
360 efl_pack(box, efl_added)); 360 efl_pack(box, efl_added));
361 361
362 snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); 362 snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get());
363 efl_add(EFL_UI_IMAGE_CLASS, win, 363 efl_add(EFL_UI_IMAGE_CLASS, win,
364 efl_file_set(efl_added, buf, NULL), 364 efl_file_set(efl_added, buf, NULL),
365 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), 365 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
366 efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), 366 efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
367 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), 367 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
368 efl_pack(box, efl_added)); 368 efl_pack(box, efl_added));
369 369
@@ -409,32 +409,32 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
409 efl_ui_win_alpha_set(efl_added, EINA_FALSE)); 409 efl_ui_win_alpha_set(efl_added, EINA_FALSE));
410 410
411 efl_add(EFL_UI_BG_CLASS, win, 411 efl_add(EFL_UI_BG_CLASS, win,
412 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), 412 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
413 efl_content_set(win, efl_added)); 413 efl_content_set(win, efl_added));
414 414
415 box = efl_add(EFL_UI_BOX_CLASS, win, 415 box = efl_add(EFL_UI_BOX_CLASS, win,
416 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 416 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
417 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), 417 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
418 efl_content_set(win, efl_added)); 418 efl_content_set(win, efl_added));
419 419
420 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 420 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
421 421
422 o_bg = efl_add(EFL_UI_BG_CLASS, box, 422 o_bg = efl_add(EFL_UI_BG_CLASS, box,
423 efl_file_set(efl_added, buf, NULL), 423 efl_file_set(efl_added, buf, NULL),
424 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), 424 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
425 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 425 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
426 efl_pack(box, efl_added)); 426 efl_pack(box, efl_added));
427 427
428 hbox = efl_add(EFL_UI_BOX_CLASS, box, 428 hbox = efl_add(EFL_UI_BOX_CLASS, box,
429 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 429 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
430 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 430 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
431 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 431 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
432 efl_pack(box, efl_added)); 432 efl_pack(box, efl_added));
433 433
434 rdg = rd = efl_add(EFL_UI_RADIO_CLASS, hbox, 434 rdg = rd = efl_add(EFL_UI_RADIO_CLASS, hbox,
435 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FILL), 435 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FILL),
436 efl_text_set(efl_added, "Fill"), 436 efl_text_set(efl_added, "Fill"),
437 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 437 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
438 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), 438 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg),
439 efl_pack(hbox, efl_added)); 439 efl_pack(hbox, efl_added));
440 440
@@ -442,7 +442,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
442 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE), 442 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE),
443 efl_ui_radio_group_add(efl_added, rdg), 443 efl_ui_radio_group_add(efl_added, rdg),
444 efl_text_set(efl_added, "Fit Inside"), 444 efl_text_set(efl_added, "Fit Inside"),
445 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 445 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
446 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), 446 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg),
447 efl_pack(hbox, efl_added)); 447 efl_pack(hbox, efl_added));
448 448
@@ -451,7 +451,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
451 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE), 451 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE),
452 efl_ui_radio_group_add(efl_added, rdg), 452 efl_ui_radio_group_add(efl_added, rdg),
453 efl_text_set(efl_added, "Fit Outside"), 453 efl_text_set(efl_added, "Fit Outside"),
454 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 454 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
455 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), 455 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg),
456 efl_pack(hbox, efl_added)); 456 efl_pack(hbox, efl_added));
457 457
@@ -459,7 +459,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
459 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_NONE), 459 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_NONE),
460 efl_ui_radio_group_add(efl_added, rdg), 460 efl_ui_radio_group_add(efl_added, rdg),
461 efl_text_set(efl_added, "None"), 461 efl_text_set(efl_added, "None"),
462 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 462 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
463 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), 463 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg),
464 efl_pack(hbox, efl_added)); 464 efl_pack(hbox, efl_added));
465 465
@@ -467,7 +467,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
467 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_TILE), 467 efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_TILE),
468 efl_ui_radio_group_add(efl_added, rdg), 468 efl_ui_radio_group_add(efl_added, rdg),
469 efl_text_set(efl_added, "Tile"), 469 efl_text_set(efl_added, "Tile"),
470 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 470 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
471 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), 471 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg),
472 efl_pack(hbox, efl_added)); 472 efl_pack(hbox, efl_added));
473 473
@@ -475,7 +475,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
475 475
476 efl_add(EFL_UI_CHECK_CLASS, hbox, 476 efl_add(EFL_UI_CHECK_CLASS, hbox,
477 efl_text_set(efl_added, "Bg Color"), 477 efl_text_set(efl_added, "Bg Color"),
478 efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), 478 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
479 efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg), 479 efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg),
480 efl_pack(hbox, efl_added)); 480 efl_pack(hbox, efl_added));
481 481
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,
909 /* rectangle with a max size */ 909 /* rectangle with a max size */
910 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, 910 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,
911 efl_gfx_color_set(efl_added, 64, 128, 64, 255), 911 efl_gfx_color_set(efl_added, 64, 128, 64, 255),
912 efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(128, 20))); 912 efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(128, 20)));
913 efl_pack(bx, o); 913 efl_pack(bx, o);
914 914
915 /* image with a forced min size */ 915 /* image with a forced min size */
916 snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); 916 snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
917 o = efl_add(EFL_UI_IMAGE_CLASS, win, 917 o = efl_add(EFL_UI_IMAGE_CLASS, win,
918 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), 918 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
919 efl_file_set(efl_added, buf, NULL)); 919 efl_file_set(efl_added, buf, NULL));
920 efl_pack(bx, o); 920 efl_pack(bx, o);
921 921
diff --git a/src/bin/elementary/test_efl_gfx_map.c b/src/bin/elementary/test_efl_gfx_mapping.c
index 72d7db139d..71cfd82257 100644
--- a/src/bin/elementary/test_efl_gfx_map.c
+++ b/src/bin/elementary/test_efl_gfx_mapping.c
@@ -6,29 +6,29 @@
6static void 6static void
7_map_set(Evas_Object *obj) 7_map_set(Evas_Object *obj)
8{ 8{
9 efl_gfx_map_reset(obj); 9 efl_gfx_mapping_reset(obj);
10 efl_gfx_map_point_count_set(obj, 8); 10 efl_gfx_mapping_point_count_set(obj, 8);
11 //1st rect 11 //1st rect
12 efl_gfx_map_coord_absolute_set(obj, 0, 100, 0, 0); 12 efl_gfx_mapping_coord_absolute_set(obj, 0, 100, 0, 0);
13 efl_gfx_map_coord_absolute_set(obj, 1, 200, 0, 0); 13 efl_gfx_mapping_coord_absolute_set(obj, 1, 200, 0, 0);
14 efl_gfx_map_coord_absolute_set(obj, 2, 200, 100, 0); 14 efl_gfx_mapping_coord_absolute_set(obj, 2, 200, 100, 0);
15 efl_gfx_map_coord_absolute_set(obj, 3, 100, 100, 0); 15 efl_gfx_mapping_coord_absolute_set(obj, 3, 100, 100, 0);
16 //2nd rect 16 //2nd rect
17 efl_gfx_map_coord_absolute_set(obj, 4, 200, 0, 0); 17 efl_gfx_mapping_coord_absolute_set(obj, 4, 200, 0, 0);
18 efl_gfx_map_coord_absolute_set(obj, 5, 100, 200, 0); 18 efl_gfx_mapping_coord_absolute_set(obj, 5, 100, 200, 0);
19 efl_gfx_map_coord_absolute_set(obj, 6, 100, 300, 0); 19 efl_gfx_mapping_coord_absolute_set(obj, 6, 100, 300, 0);
20 efl_gfx_map_coord_absolute_set(obj, 7, 200, 100, 0); 20 efl_gfx_mapping_coord_absolute_set(obj, 7, 200, 100, 0);
21 21
22 //uv: 1st rect: uv: [0-1] 22 //uv: 1st rect: uv: [0-1]
23 efl_gfx_map_uv_set(obj, 0, 0, 0); 23 efl_gfx_mapping_uv_set(obj, 0, 0, 0);
24 efl_gfx_map_uv_set(obj, 1, 0.5, 0); 24 efl_gfx_mapping_uv_set(obj, 1, 0.5, 0);
25 efl_gfx_map_uv_set(obj, 2, 0.5, 1); 25 efl_gfx_mapping_uv_set(obj, 2, 0.5, 1);
26 efl_gfx_map_uv_set(obj, 3, 0, 1); 26 efl_gfx_mapping_uv_set(obj, 3, 0, 1);
27 //uv: 2nd rect 27 //uv: 2nd rect
28 efl_gfx_map_uv_set(obj, 4, 0.5, 0); 28 efl_gfx_mapping_uv_set(obj, 4, 0.5, 0);
29 efl_gfx_map_uv_set(obj, 5, 1, 0); 29 efl_gfx_mapping_uv_set(obj, 5, 1, 0);
30 efl_gfx_map_uv_set(obj, 6, 1, 1); 30 efl_gfx_mapping_uv_set(obj, 6, 1, 1);
31 efl_gfx_map_uv_set(obj, 7, 0.5, 1); 31 efl_gfx_mapping_uv_set(obj, 7, 0.5, 1);
32} 32}
33 33
34static void 34static void
@@ -38,7 +38,7 @@ _image_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
38} 38}
39 39
40void 40void
41test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, 41test_efl_gfx_mapping(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
42 void *event_info EINA_UNUSED) 42 void *event_info EINA_UNUSED)
43{ 43{
44 const Evas_Coord W = 300, H = 300; 44 const Evas_Coord W = 300, H = 300;
@@ -52,7 +52,7 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
52 /* image with a min size */ 52 /* image with a min size */
53 snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); 53 snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get());
54 img = efl_add(EFL_UI_IMAGE_CLASS, win, 54 img = efl_add(EFL_UI_IMAGE_CLASS, win,
55 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), 55 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
56 efl_file_set(efl_added, buf, NULL)); 56 efl_file_set(efl_added, buf, NULL));
57 efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 57 efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
58 evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, 58 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
150 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 150 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
151 151
152 bx = efl_add(EFL_UI_BOX_CLASS, win); 152 bx = efl_add(EFL_UI_BOX_CLASS, win);
153 efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 153 efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
154 efl_content_set(win, bx); 154 efl_content_set(win, bx);
155 155
156 en = efl_add(EFL_UI_TEXT_CLASS, bx, 156 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
174 "occaecat cupidatat non proident, sunt in culpa qui officia deserunt\n" 174 "occaecat cupidatat non proident, sunt in culpa qui officia deserunt\n"
175 "mollit anim id est laborum"); 175 "mollit anim id est laborum");
176 176
177 efl_gfx_size_hint_min_set(en, EINA_SIZE2D(300, 100)); 177 efl_gfx_hint_size_min_set(en, EINA_SIZE2D(300, 100));
178 efl_pack(bx, en); 178 efl_pack(bx, en);
179 179
180 bx2 = efl_add(EFL_UI_BOX_CLASS, bx); 180 bx2 = efl_add(EFL_UI_BOX_CLASS, bx);
181 efl_gfx_size_hint_weight_set(bx2, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 181 efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
182 efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); 182 efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL);
183 183
184 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 184 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
185 efl_text_set(bt, "Sel"); 185 efl_text_set(bt, "Sel");
186 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en); 186 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en);
187 efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); 187 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
188 efl_pack(bx2, bt); 188 efl_pack(bx2, bt);
189 elm_object_focus_allow_set(bt, EINA_FALSE); 189 elm_object_focus_allow_set(bt, EINA_FALSE);
190 190
191 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 191 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
192 efl_text_set(bt, "Wr"); 192 efl_text_set(bt, "Wr");
193 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en); 193 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en);
194 efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); 194 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
195 efl_pack(bx2, bt); 195 efl_pack(bx2, bt);
196 elm_object_focus_allow_set(bt, EINA_FALSE); 196 elm_object_focus_allow_set(bt, EINA_FALSE);
197 197
@@ -209,7 +209,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
209 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 209 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
210 210
211 bx = efl_add(EFL_UI_BOX_CLASS, win); 211 bx = efl_add(EFL_UI_BOX_CLASS, win);
212 efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 212 efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
213 efl_content_set(win, bx); 213 efl_content_set(win, bx);
214 214
215 en = efl_add(EFL_UI_TEXT_CLASS, bx, 215 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,
370 elm_object_focus_set(en, EINA_TRUE); 370 elm_object_focus_set(en, EINA_TRUE);
371 371
372 bx2 = efl_add(EFL_UI_BOX_CLASS, bx); 372 bx2 = efl_add(EFL_UI_BOX_CLASS, bx);
373 efl_gfx_size_hint_weight_set(bx2, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 373 efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
374 efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); 374 efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL);
375 375
376 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 376 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
377 efl_text_set(bt, "Image"); 377 efl_text_set(bt, "Image");
378 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en); 378 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en);
379 efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); 379 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
380 efl_pack(bx2, bt); 380 efl_pack(bx2, bt);
381 elm_object_focus_allow_set(bt, EINA_FALSE); 381 elm_object_focus_allow_set(bt, EINA_FALSE);
382 382
383 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 383 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
384 efl_text_set(bt, "Emoticon"); 384 efl_text_set(bt, "Emoticon");
385 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); 385 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en);
386 efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); 386 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
387 efl_pack(bx2, bt); 387 efl_pack(bx2, bt);
388 elm_object_focus_allow_set(bt, EINA_FALSE); 388 elm_object_focus_allow_set(bt, EINA_FALSE);
389 389
390 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 390 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
391 efl_text_set(bt, "Factory"); 391 efl_text_set(bt, "Factory");
392 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); 392 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en);
393 efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); 393 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
394 efl_pack(bx2, bt); 394 efl_pack(bx2, bt);
395 elm_object_focus_allow_set(bt, EINA_FALSE); 395 elm_object_focus_allow_set(bt, EINA_FALSE);
396 396
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,
60 /* image with a min size */ 60 /* image with a min size */
61 snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); 61 snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get());
62 img = efl_add(EFL_UI_IMAGE_CLASS, win, 62 img = efl_add(EFL_UI_IMAGE_CLASS, win,
63 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), 63 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
64 efl_file_set(efl_added, buf, NULL)); 64 efl_file_set(efl_added, buf, NULL));
65 efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 65 efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
66 evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, 66 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..497d4a2a97 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -81,12 +81,12 @@ _toggle_map(void *data, const Efl_Event *ev EINA_UNUSED)
81{ 81{
82 Eo *ly = data; 82 Eo *ly = data;
83 83
84 if (!efl_gfx_map_has(ly)) 84 if (!efl_gfx_mapping_has(ly))
85 { 85 {
86 efl_gfx_map_zoom(ly, 0.8, 0.8, NULL, 0.5, 0.5); 86 efl_gfx_mapping_zoom(ly, 0.8, 0.8, NULL, 0.5, 0.5);
87 efl_gfx_map_rotate(ly, 45, NULL, 0.5, 0.5); 87 efl_gfx_mapping_rotate(ly, 45, NULL, 0.5, 0.5);
88 } 88 }
89 else efl_gfx_map_reset(ly); 89 else efl_gfx_mapping_reset(ly);
90} 90}
91 91
92static void 92static void
@@ -129,8 +129,8 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
129 // FIXME: No genlist in EO API 129 // FIXME: No genlist in EO API
130 o = gl = elm_genlist_add(win); 130 o = gl = elm_genlist_add(win);
131 elm_genlist_homogeneous_set(gl, 1); 131 elm_genlist_homogeneous_set(gl, 1);
132 efl_gfx_size_hint_align_set(o, -1, -1); 132 efl_gfx_hint_align_set(o, -1, -1);
133 efl_gfx_size_hint_weight_set(o, 1, 1); 133 efl_gfx_hint_weight_set(o, 1, 1);
134 134
135 itc = elm_genlist_item_class_new(); 135 itc = elm_genlist_item_class_new();
136 itc->item_style = "default"; 136 itc->item_style = "default";
@@ -154,26 +154,26 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
154 154
155 box2 = efl_add(EFL_UI_BOX_CLASS, win, 155 box2 = efl_add(EFL_UI_BOX_CLASS, win,
156 efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR), 156 efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR),
157 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 157 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
158 efl_pack(box, efl_added)); 158 efl_pack(box, efl_added));
159 159
160 // FIXME: button EO API 160 // FIXME: button EO API
161 efl_add(EFL_UI_BUTTON_CLASS, win, 161 efl_add(EFL_UI_BUTTON_CLASS, win,
162 efl_text_set(efl_added, "Toggle mask"), 162 efl_text_set(efl_added, "Toggle mask"),
163 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), 163 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
164 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), 164 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
165 efl_pack(box2, efl_added)); 165 efl_pack(box2, efl_added));
166 166
167 efl_add(EFL_UI_BUTTON_CLASS, win, 167 efl_add(EFL_UI_BUTTON_CLASS, win,
168 efl_text_set(efl_added, "Toggle map"), 168 efl_text_set(efl_added, "Toggle map"),
169 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), 169 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
170 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), 170 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
171 efl_pack(box2, efl_added)); 171 efl_pack(box2, efl_added));
172 172
173 efl_add(EFL_UI_BUTTON_CLASS, win, 173 efl_add(EFL_UI_BUTTON_CLASS, win,
174 efl_text_set(efl_added, "Rotate Window"), 174 efl_text_set(efl_added, "Rotate Window"),
175 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), 175 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
176 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), 176 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
177 efl_pack(box2, efl_added)); 177 efl_pack(box2, efl_added));
178 178
179 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600)); 179 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..c1b110ead6 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)
30{ 30{
31 return efl_add(EFL_UI_IMAGE_CLASS, win, 31 return efl_add(EFL_UI_IMAGE_CLASS, win,
32 efl_file_set(efl_added, path, NULL), 32 efl_file_set(efl_added, path, NULL),
33 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(20, 20))); 33 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(20, 20)));
34} 34}
35 35
36static void 36static void
@@ -104,12 +104,12 @@ _toggle_map(void *data, const Efl_Event *ev EINA_UNUSED)
104 Eo *snap; 104 Eo *snap;
105 105
106 snap = efl_key_wref_get(win, "snap"); 106 snap = efl_key_wref_get(win, "snap");
107 if (!efl_gfx_map_has(snap)) 107 if (!efl_gfx_mapping_has(snap))
108 { 108 {
109 efl_gfx_map_zoom(snap, 0.8, 0.8, NULL, 0.5, 0.5); 109 efl_gfx_mapping_zoom(snap, 0.8, 0.8, NULL, 0.5, 0.5);
110 efl_gfx_map_rotate(snap, 20.0, NULL, 0.5, 0.5); 110 efl_gfx_mapping_rotate(snap, 20.0, NULL, 0.5, 0.5);
111 } 111 }
112 else efl_gfx_map_reset(snap); 112 else efl_gfx_mapping_reset(snap);
113} 113}
114 114
115void 115void
@@ -169,36 +169,36 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
169 elm_slider_min_max_set(efl_added, 0, 64), 169 elm_slider_min_max_set(efl_added, 0, 64),
170 elm_slider_value_set(efl_added, 5), 170 elm_slider_value_set(efl_added, 5),
171 elm_slider_unit_format_set(efl_added, "%.0f px"), 171 elm_slider_unit_format_set(efl_added, "%.0f px"),
172 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 172 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
173 efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1), 173 efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1),
174 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); 174 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win));
175 175
176 box = efl_add(EFL_UI_BOX_CLASS, win, 176 box = efl_add(EFL_UI_BOX_CLASS, win,
177 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 177 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
178 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 178 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
179 efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1)); 179 efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1));
180 180
181 efl_add(EFL_UI_BUTTON_CLASS, win, 181 efl_add(EFL_UI_BUTTON_CLASS, win,
182 efl_text_set(efl_added, "Toggle animation"), 182 efl_text_set(efl_added, "Toggle animation"),
183 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 183 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
184 efl_pack(box, efl_added), 184 efl_pack(box, efl_added),
185 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win)); 185 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win));
186 186
187 efl_add(EFL_UI_BUTTON_CLASS, win, 187 efl_add(EFL_UI_BUTTON_CLASS, win,
188 efl_text_set(efl_added, "Save to file"), 188 efl_text_set(efl_added, "Save to file"),
189 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 189 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
190 efl_pack(box, efl_added), 190 efl_pack(box, efl_added),
191 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win)); 191 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win));
192 192
193 efl_add(EFL_UI_BUTTON_CLASS, win, 193 efl_add(EFL_UI_BUTTON_CLASS, win,
194 efl_text_set(efl_added, "Map"), 194 efl_text_set(efl_added, "Map"),
195 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 195 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
196 efl_pack(box, efl_added), 196 efl_pack(box, efl_added),
197 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win)); 197 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win));
198 198
199 efl_add(EFL_UI_BUTTON_CLASS, win, 199 efl_add(EFL_UI_BUTTON_CLASS, win,
200 efl_text_set(efl_added, "Close"), 200 efl_text_set(efl_added, "Close"),
201 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 201 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
202 efl_pack(box, efl_added), 202 efl_pack(box, efl_added),
203 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win)); 203 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win));
204 204
diff --git a/src/bin/elementary/test_flip_page_eo.c b/src/bin/elementary/test_flip_page_eo.c
index a1ce5f5b66..e313e2848c 100644
--- a/src/bin/elementary/test_flip_page_eo.c
+++ b/src/bin/elementary/test_flip_page_eo.c
@@ -88,34 +88,34 @@ _slice_apply(State *st, Slice *sl,
88 Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED, Evas_Coord w, Evas_Coord h EINA_UNUSED, 88 Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED, Evas_Coord w, Evas_Coord h EINA_UNUSED,
89 Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh) 89 Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh)
90{ 90{
91 efl_gfx_map_reset(sl->obj); 91 efl_gfx_mapping_reset(sl->obj);
92 efl_gfx_map_smooth_set(sl->obj, EINA_TRUE); 92 efl_gfx_mapping_smooth_set(sl->obj, EINA_TRUE);
93 efl_gfx_map_color_set(sl->obj, -1, 255, 255, 255, 255); 93 efl_gfx_mapping_color_set(sl->obj, -1, 255, 255, 255, 255);
94 for (int i = 0; i < 4; i++) 94 for (int i = 0; i < 4; i++)
95 { 95 {
96 if (st->dir == 0) 96 if (st->dir == 0)
97 { 97 {
98 int p[4] = { 0, 1, 2, 3 }; 98 int p[4] = { 0, 1, 2, 3 };
99 efl_gfx_map_coord_absolute_set(sl->obj, i, ox + sl->x[p[i]], oy + sl->y[p[i]], sl->z[p[i]]); 99 efl_gfx_mapping_coord_absolute_set(sl->obj, i, ox + sl->x[p[i]], oy + sl->y[p[i]], sl->z[p[i]]);
100 efl_gfx_map_uv_set(sl->obj, i, sl->u[p[i]] , sl->v[p[i]]); 100 efl_gfx_mapping_uv_set(sl->obj, i, sl->u[p[i]] , sl->v[p[i]]);
101 } 101 }
102 else if (st->dir == 1) 102 else if (st->dir == 1)
103 { 103 {
104 int p[4] = { 1, 0, 3, 2 }; 104 int p[4] = { 1, 0, 3, 2 };
105 efl_gfx_map_coord_absolute_set(sl->obj, i, ox + (w - sl->x[p[i]]), oy + sl->y[p[i]], sl->z[p[i]]); 105 efl_gfx_mapping_coord_absolute_set(sl->obj, i, ox + (w - sl->x[p[i]]), oy + sl->y[p[i]], sl->z[p[i]]);
106 efl_gfx_map_uv_set(sl->obj, i, 1. - sl->u[p[i]] , sl->v[p[i]]); 106 efl_gfx_mapping_uv_set(sl->obj, i, 1. - sl->u[p[i]] , sl->v[p[i]]);
107 } 107 }
108 else if (st->dir == 2) 108 else if (st->dir == 2)
109 { 109 {
110 int p[4] = { 1, 0, 3, 2 }; 110 int p[4] = { 1, 0, 3, 2 };
111 efl_gfx_map_coord_absolute_set(sl->obj, i, ox + sl->y[p[i]], oy + sl->x[p[i]], sl->z[p[i]]); 111 efl_gfx_mapping_coord_absolute_set(sl->obj, i, ox + sl->y[p[i]], oy + sl->x[p[i]], sl->z[p[i]]);
112 efl_gfx_map_uv_set(sl->obj, i, sl->v[p[i]] , sl->u[p[i]]); 112 efl_gfx_mapping_uv_set(sl->obj, i, sl->v[p[i]] , sl->u[p[i]]);
113 } 113 }
114 else if (st->dir == 3) 114 else if (st->dir == 3)
115 { 115 {
116 int p[4] = { 0, 1, 2, 3 }; 116 int p[4] = { 0, 1, 2, 3 };
117 efl_gfx_map_coord_absolute_set(sl->obj, i, ox + sl->y[p[i]], oy + (w - sl->x[p[i]]), sl->z[p[i]]); 117 efl_gfx_mapping_coord_absolute_set(sl->obj, i, ox + sl->y[p[i]], oy + (w - sl->x[p[i]]), sl->z[p[i]]);
118 efl_gfx_map_uv_set(sl->obj, i, sl->v[p[i]] , 1. - sl->u[p[i]]); 118 efl_gfx_mapping_uv_set(sl->obj, i, sl->v[p[i]] , 1. - sl->u[p[i]]);
119 } 119 }
120 } 120 }
121 evas_object_image_fill_set(sl->obj, 0, 0, ow, oh); 121 evas_object_image_fill_set(sl->obj, 0, 0, ow, oh);
@@ -125,22 +125,22 @@ static void
125_slice_3d(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 125_slice_3d(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
126{ 126{
127 // vanishing point is center of page, and focal dist is 1024 127 // vanishing point is center of page, and focal dist is 1024
128 efl_gfx_map_perspective_3d_absolute(sl->obj, x + (w / 2), y + (h / 2), 0, 1024); 128 efl_gfx_mapping_perspective_3d_absolute(sl->obj, x + (w / 2), y + (h / 2), 0, 1024);
129 129
130 for (int i = 0; i < 4; i++) 130 for (int i = 0; i < 4; i++)
131 { 131 {
132 double xx, yy; 132 double xx, yy;
133 133
134 efl_gfx_map_coord_absolute_get(sl->obj, i, &xx, &yy, NULL); 134 efl_gfx_mapping_coord_absolute_get(sl->obj, i, &xx, &yy, NULL);
135 efl_gfx_map_coord_absolute_set(sl->obj, i, xx, yy, 0); 135 efl_gfx_mapping_coord_absolute_set(sl->obj, i, xx, yy, 0);
136 } 136 }
137 efl_gfx_entity_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj)); 137 efl_gfx_entity_visible_set(sl->obj, efl_gfx_mapping_clockwise_get(sl->obj));
138} 138}
139 139
140static void 140static void
141_slice_light(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 141_slice_light(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
142{ 142{
143 efl_gfx_map_lightning_3d_absolute(sl->obj, 143 efl_gfx_mapping_lighting_3d_absolute(sl->obj,
144 // light position 144 // light position
145 // (centered over page 10 * h toward camera) 145 // (centered over page 10 * h toward camera)
146 x + (w / 2), y + (h / 2), -10000, 146 x + (w / 2), y + (h / 2), -10000,
@@ -153,11 +153,11 @@ _slice_light(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_
153 { 153 {
154 int r, g, b, a; 154 int r, g, b, a;
155 155
156 efl_gfx_map_color_get(sl->obj, i, &r, &g, &b, &a); 156 efl_gfx_mapping_color_get(sl->obj, i, &r, &g, &b, &a);
157 r = (double)r * 1.2; if (r > 255) r = 255; 157 r = (double)r * 1.2; if (r > 255) r = 255;
158 g = (double)g * 1.2; if (g > 255) g = 255; 158 g = (double)g * 1.2; if (g > 255) g = 255;
159 b = (double)b * 1.2; if (b > 255) b = 255; 159 b = (double)b * 1.2; if (b > 255) b = 255;
160 efl_gfx_map_color_set(sl->obj, i, r, g, b, a); 160 efl_gfx_mapping_color_set(sl->obj, i, r, g, b, a);
161 } 161 }
162} 162}
163 163
@@ -253,7 +253,7 @@ _slice_obj_color_sum(Slice *s, int p, int *r, int *g, int *b, int *a)
253 int rr = 0, gg = 0, bb = 0, aa = 0; 253 int rr = 0, gg = 0, bb = 0, aa = 0;
254 254
255 if (!s) return 0; 255 if (!s) return 0;
256 efl_gfx_map_color_get(s->obj, p, &rr, &gg, &bb, &aa); 256 efl_gfx_mapping_color_get(s->obj, p, &rr, &gg, &bb, &aa);
257 *r += rr; *g += gg; *b += bb; *a += aa; 257 *r += rr; *g += gg; *b += bb; *a += aa;
258 return 1; 258 return 1;
259} 259}
@@ -262,7 +262,7 @@ static void
262_slice_obj_color_set(Slice *s, int p, int r, int g, int b, int a) 262_slice_obj_color_set(Slice *s, int p, int r, int g, int b, int a)
263{ 263{
264 if (!s) return; 264 if (!s) return;
265 efl_gfx_map_color_set(s->obj, p, r, g, b, a); 265 efl_gfx_mapping_color_set(s->obj, p, r, g, b, a);
266} 266}
267 267
268static void 268static void
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 58fd21c4a5..965720a604 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)
248 Eina_Size2D sz; 248 Eina_Size2D sz;
249 249
250 sz = efl_gfx_entity_size_get(ev->object); 250 sz = efl_gfx_entity_size_get(ev->object);
251 efl_gfx_size_hint_min_set(ev->object, sz); 251 efl_gfx_hint_size_min_set(ev->object, sz);
252} 252}
253 253
254static void 254static void
@@ -258,7 +258,7 @@ _textblock_resize(void *data EINA_UNUSED, const Efl_Event *ev)
258 258
259 evas_object_textblock_size_native_get(ev->object, &w, &h); 259 evas_object_textblock_size_native_get(ev->object, &w, &h);
260 evas_object_textblock_style_insets_get(ev->object, &l, &r, &t, &b); 260 evas_object_textblock_style_insets_get(ev->object, &l, &r, &t, &b);
261 efl_gfx_size_hint_min_set(ev->object, EINA_SIZE2D(w + l + r, h + t + b)); 261 efl_gfx_hint_size_min_set(ev->object, EINA_SIZE2D(w + l + r, h + t + b));
262} 262}
263 263
264static void 264static void
@@ -345,28 +345,28 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
345 { 345 {
346 box2 = efl_add(EFL_UI_BOX_CLASS, win, 346 box2 = efl_add(EFL_UI_BOX_CLASS, win,
347 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 347 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
348 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 348 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
349 efl_gfx_size_hint_align_set(efl_added, 0.5, 0.0), 349 efl_gfx_hint_align_set(efl_added, 0.5, 0.0),
350 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); 350 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE));
351 efl_pack(box, box2); 351 efl_pack(box, box2);
352 352
353 /* FIXME: Efl.Ui.Text doesn't work as expected. */ 353 /* FIXME: Efl.Ui.Text doesn't work as expected. */
354 o = efl_add(EFL_UI_TEXT_CLASS, win, 354 o = efl_add(EFL_UI_TEXT_CLASS, win,
355 efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), 355 efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
356 efl_gfx_size_hint_align_set(efl_added, 1.0, 0.5)); 356 efl_gfx_hint_align_set(efl_added, 1.0, 0.5));
357 efl_text_set(o, "Filter:"); 357 efl_text_set(o, "Filter:");
358 efl_pack(box2, o); 358 efl_pack(box2, o);
359 359
360 o = spinner = elm_spinner_add(win); 360 o = spinner = elm_spinner_add(win);
361 efl_gfx_size_hint_weight_set(o, 1.0, 1.0); 361 efl_gfx_hint_weight_set(o, 1.0, 1.0);
362 efl_gfx_size_hint_align_set(o, -1.0, 0.5); 362 efl_gfx_hint_align_set(o, -1.0, 0.5);
363 _spinner_fill(o); 363 _spinner_fill(o);
364 efl_pack(box2, o); 364 efl_pack(box2, o);
365 evas_object_show(o); 365 evas_object_show(o);
366 366
367 o = elm_spinner_add(win); 367 o = elm_spinner_add(win);
368 efl_gfx_size_hint_weight_set(o, 0.0, 1.0); 368 efl_gfx_hint_weight_set(o, 0.0, 1.0);
369 efl_gfx_size_hint_align_set(o, -1.0, 0.5); 369 efl_gfx_hint_align_set(o, -1.0, 0.5);
370 elm_spinner_min_max_set(o, 6, 120); 370 elm_spinner_min_max_set(o, 6, 120);
371 elm_spinner_value_set(o, default_font_size); 371 elm_spinner_value_set(o, default_font_size);
372 efl_event_callback_add(o, ELM_SPINNER_EVENT_DELAY_CHANGED, _font_size_change, win); 372 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
375 375
376 o = efl_add(EFL_UI_BUTTON_CLASS, win, 376 o = efl_add(EFL_UI_BUTTON_CLASS, win,
377 efl_text_set(efl_added, "Flip"), 377 efl_text_set(efl_added, "Flip"),
378 efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), 378 efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
379 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 379 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
380 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win)); 380 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win));
381 efl_pack(box2, o); 381 efl_pack(box2, o);
382 } 382 }
@@ -384,10 +384,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
384 { 384 {
385 box2 = efl_add(EFL_UI_BOX_CLASS, win, 385 box2 = efl_add(EFL_UI_BOX_CLASS, win,
386 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 386 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
387 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 387 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
388 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 388 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
389 efl_pack_padding_set(efl_added, 5, 5, 1), 389 efl_pack_padding_set(efl_added, 5, 5, 1),
390 efl_gfx_size_hint_margin_set(efl_added, 5, 5, 5, 5), 390 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5),
391 efl_pack_align_set(efl_added, 0, 0.5)); 391 efl_pack_align_set(efl_added, 0, 0.5));
392 efl_pack(box, box2); 392 efl_pack(box, box2);
393 393
@@ -399,10 +399,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
399 if (!images[k].path) break; 399 if (!images[k].path) break;
400 snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), images[k].path); 400 snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), images[k].path);
401 o = efl_add(EFL_UI_IMAGE_CLASS, win, 401 o = efl_add(EFL_UI_IMAGE_CLASS, win,
402 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), 402 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
403 efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), 403 efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
404 efl_gfx_size_hint_max_set(efl_added, size), 404 efl_gfx_hint_size_max_set(efl_added, size),
405 efl_gfx_size_hint_min_set(efl_added, size), 405 efl_gfx_hint_size_min_set(efl_added, size),
406 efl_file_set(efl_added, buf, NULL), 406 efl_file_set(efl_added, buf, NULL),
407 efl_name_set(efl_added, images[k].src_name), 407 efl_name_set(efl_added, images[k].src_name),
408 elm_object_tooltip_text_set(efl_added, images[k].src_name)); 408 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
429 }; 429 };
430 430
431 o = elm_colorselector_add(win); 431 o = elm_colorselector_add(win);
432 efl_gfx_size_hint_weight_set(o, 1.0, 0); 432 efl_gfx_hint_weight_set(o, 1.0, 0);
433 efl_gfx_size_hint_align_set(o, -1.0, 0); 433 efl_gfx_hint_align_set(o, -1.0, 0);
434 elm_colorselector_mode_set(o, ELM_COLORSELECTOR_PALETTE); 434 elm_colorselector_mode_set(o, ELM_COLORSELECTOR_PALETTE);
435 efl_gfx_size_hint_max_set(o, maxsz); 435 efl_gfx_hint_size_max_set(o, maxsz);
436 efl_name_set(o, "myColor"); 436 efl_name_set(o, "myColor");
437 elm_object_tooltip_text_set(o, "Pick a color to use as variable 'myColor'"); 437 elm_object_tooltip_text_set(o, "Pick a color to use as variable 'myColor'");
438 evas_object_smart_callback_add(o, "changed", _colsel_cb, win); 438 evas_object_smart_callback_add(o, "changed", _colsel_cb, win);
@@ -453,14 +453,14 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
453 453
454 box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, 454 box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
455 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 455 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
456 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 456 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
457 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 457 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
458 efl_pack_align_set(efl_added, 0.5, 0.5)); 458 efl_pack_align_set(efl_added, 0.5, 0.5));
459 efl_pack(flip, box2); 459 efl_pack(flip, box2);
460 460
461 // Note: No TEXT object with EO APIs 461 // Note: No TEXT object with EO APIs
462 o = text = evas_object_text_add(evas_object_evas_get(win)); 462 o = text = evas_object_text_add(evas_object_evas_get(win));
463 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _text_resize, NULL); 463 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _text_resize, NULL);
464 efl_text_font_set(o, "Sans:style=Bold", default_font_size); 464 efl_text_font_set(o, "Sans:style=Bold", default_font_size);
465 efl_gfx_entity_scale_set(text, elm_config_scale_get()); 465 efl_gfx_entity_scale_set(text, elm_config_scale_get());
466 efl_text_set(o, "EFL"); 466 efl_text_set(o, "EFL");
@@ -469,8 +469,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
469 469
470 o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, 470 o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
471 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 471 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
472 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 472 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
473 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 473 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
474 efl_pack_align_set(efl_added, 0.5, 0.5)); 474 efl_pack_align_set(efl_added, 0.5, 0.5));
475 efl_pack(flip, box2); 475 efl_pack(flip, box2);
476 476
@@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
492 // Experimental textblock support 492 // Experimental textblock support
493 o = tb = evas_object_textblock_add(evas_object_evas_get(win)); 493 o = tb = evas_object_textblock_add(evas_object_evas_get(win));
494 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); 494 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
495 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _textblock_resize, NULL); 495 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
496 Evas_Textblock_Style *st = evas_textblock_style_new(); 496 Evas_Textblock_Style *st = evas_textblock_style_new();
497 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'"); 497 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
498 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++) 498 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++)
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)
63 63
64 hbox = efl_add(EFL_UI_BOX_CLASS, box, 64 hbox = efl_add(EFL_UI_BOX_CLASS, box,
65 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 65 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
66 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 66 efl_gfx_hint_weight_set(efl_added, 1, 1),
67 efl_pack_end(box, efl_added)); 67 efl_pack_end(box, efl_added));
68 68
69 radio_group = radio = efl_add(EFL_UI_RADIO_CLASS, hbox, 69 radio_group = radio = efl_add(EFL_UI_RADIO_CLASS, hbox,
70 efl_pack_end(hbox, efl_added), 70 efl_pack_end(hbox, efl_added),
71 efl_gfx_size_hint_weight_set(efl_added, 0, 0), 71 efl_gfx_hint_weight_set(efl_added, 0, 0),
72 efl_ui_radio_state_value_set(efl_added, 0)); 72 efl_ui_radio_state_value_set(efl_added, 0));
73 73
74 content = efl_add(EFL_UI_BOX_CLASS, hbox, 74 content = efl_add(EFL_UI_BOX_CLASS, hbox,
@@ -92,7 +92,7 @@ _create_box_contents(Evas_Object *box)
92 efl_ui_radio_group_add(efl_added, radio_group), 92 efl_ui_radio_group_add(efl_added, radio_group),
93 efl_pack_end(hbox, efl_added), 93 efl_pack_end(hbox, efl_added),
94 efl_ui_radio_state_value_set(efl_added, i + 1), 94 efl_ui_radio_state_value_set(efl_added, i + 1),
95 efl_gfx_size_hint_weight_set(efl_added, 0, 0)); 95 efl_gfx_hint_weight_set(efl_added, 0, 0));
96 96
97 content = efl_add(content_class[i], hbox, 97 content = efl_add(content_class[i], hbox,
98 efl_pack_end(hbox, efl_added)); 98 efl_pack_end(hbox, efl_added));
@@ -147,12 +147,12 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
147 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 147 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
148 148
149 vbox = efl_add(EFL_UI_BOX_CLASS, win, 149 vbox = efl_add(EFL_UI_BOX_CLASS, win,
150 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 150 efl_gfx_hint_weight_set(efl_added, 1, 1),
151 efl_content_set(win, efl_added)); 151 efl_content_set(win, efl_added));
152 152
153 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 153 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
154 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 154 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
155 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 155 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
156 efl_pack_end(vbox, efl_added)); 156 efl_pack_end(vbox, efl_added));
157 157
158 reset_btn = efl_add(EFL_UI_BUTTON_CLASS, hbox, 158 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
172 efl_pack_end(vbox, scr); 172 efl_pack_end(vbox, scr);
173 173
174 vbox = efl_add(EFL_UI_BOX_CLASS, scr, 174 vbox = efl_add(EFL_UI_BOX_CLASS, scr,
175 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 175 efl_gfx_hint_weight_set(efl_added, 1, 1),
176 efl_content_set(scr, efl_added)); 176 efl_content_set(scr, efl_added));
177 177
178 radio_group = _create_box_contents(vbox); 178 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..70d9a6f6d2 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -45,7 +45,7 @@ pulse_start(void *data, const Efl_Event *ev EINA_UNUSED)
45 efl_ui_widget_disabled_set(td->btn_start, EINA_TRUE); 45 efl_ui_widget_disabled_set(td->btn_start, EINA_TRUE);
46 efl_ui_widget_disabled_set(td->btn_stop, EINA_FALSE); 46 efl_ui_widget_disabled_set(td->btn_stop, EINA_FALSE);
47 47
48 efl_event_callback_add(td->ico, EFL_EVENT_ANIMATOR_TICK, animate, td); 48 efl_event_callback_add(td->ico, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, animate, td);
49} 49}
50 50
51static void 51static void
@@ -62,7 +62,7 @@ pulse_stop(void *data, const Efl_Event *ev EINA_UNUSED)
62 efl_ui_widget_disabled_set(td->btn_start, EINA_FALSE); 62 efl_ui_widget_disabled_set(td->btn_start, EINA_FALSE);
63 efl_ui_widget_disabled_set(td->btn_stop, EINA_TRUE); 63 efl_ui_widget_disabled_set(td->btn_stop, EINA_TRUE);
64 64
65 efl_event_callback_del(td->ico, EFL_EVENT_ANIMATOR_TICK, animate, td); 65 efl_event_callback_del(td->ico, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, animate, td);
66} 66}
67 67
68static void 68static void
@@ -94,7 +94,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
94 efl_content_set(win, bx); 94 efl_content_set(win, bx);
95 95
96 pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); 96 pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win);
97 efl_gfx_size_hint_weight_set(pb, EFL_GFX_SIZE_HINT_EXPAND, 0); 97 efl_gfx_hint_weight_set(pb, EFL_GFX_HINT_EXPAND, 0);
98 efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); 98 efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE);
99 efl_pack(bx, pb); 99 efl_pack(bx, pb);
100 td->pb1 = pb; 100 td->pb1 = pb;
@@ -122,7 +122,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
122 122
123 pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); 123 pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win);
124 efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); 124 efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE);
125 efl_gfx_size_hint_weight_set(pb, EFL_GFX_SIZE_HINT_EXPAND, 0); 125 efl_gfx_hint_weight_set(pb, EFL_GFX_HINT_EXPAND, 0);
126 efl_pack(bx, pb); 126 efl_pack(bx, pb);
127 td->pb4 = pb; 127 td->pb4 = pb;
128 128
@@ -143,7 +143,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
143 143
144 hbx = efl_add(EFL_UI_BOX_CLASS, win); 144 hbx = efl_add(EFL_UI_BOX_CLASS, win);
145 efl_ui_direction_set(hbx, EFL_UI_DIR_HORIZONTAL); 145 efl_ui_direction_set(hbx, EFL_UI_DIR_HORIZONTAL);
146 efl_gfx_size_hint_weight_set(hbx, EFL_GFX_SIZE_HINT_EXPAND, 0); 146 efl_gfx_hint_weight_set(hbx, EFL_GFX_HINT_EXPAND, 0);
147 efl_pack(bx, hbx); 147 efl_pack(bx, hbx);
148 148
149 // FIXME: Needs wheel progressbar class 149 // FIXME: Needs wheel progressbar class
@@ -176,7 +176,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
176 176
177 bt_bx = efl_add(EFL_UI_BOX_CLASS, win); 177 bt_bx = efl_add(EFL_UI_BOX_CLASS, win);
178 efl_ui_direction_set(bt_bx, EFL_UI_DIR_HORIZONTAL); 178 efl_ui_direction_set(bt_bx, EFL_UI_DIR_HORIZONTAL);
179 efl_gfx_size_hint_weight_set(bt_bx, EFL_GFX_SIZE_HINT_EXPAND, 0); 179 efl_gfx_hint_weight_set(bt_bx, EFL_GFX_HINT_EXPAND, 0);
180 efl_pack(bx, bt_bx); 180 efl_pack(bx, bt_bx);
181 181
182 bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); 182 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..c1e055e997 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
816 efl_add(EFL_UI_TEXT_CLASS, bx, 816 efl_add(EFL_UI_TEXT_CLASS, bx,
817 efl_text_set(efl_added, "Clicking the image will play/pause animation."), 817 efl_text_set(efl_added, "Clicking the image will play/pause animation."),
818 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 818 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
819 efl_gfx_size_hint_weight_set(efl_added, 1, 0), 819 efl_gfx_hint_weight_set(efl_added, 1, 0),
820 efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"), 820 efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
821 efl_pack(bx, efl_added) 821 efl_pack(bx, efl_added)
822 ); 822 );
@@ -842,8 +842,8 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
842 ); 842 );
843 843
844 // add move/resize callbacks to resize rect manually 844 // add move/resize callbacks to resize rect manually
845 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_RESIZE, _zoomable_move_resize_cb, rect); 845 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _zoomable_move_resize_cb, rect);
846 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_MOVE, _zoomable_move_resize_cb, rect); 846 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _zoomable_move_resize_cb, rect);
847 847
848 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320)); 848 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
849} 849}
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)
26 switch (mode) 26 switch (mode)
27 { 27 {
28 case NONE: 28 case NONE:
29 efl_gfx_size_hint_align_set(data, 0.5, 0.5); 29 efl_gfx_hint_align_set(data, 0.5, 0.5);
30 for (int i = 0; i < CNT; i++) 30 for (int i = 0; i < CNT; i++)
31 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 31 efl_gfx_hint_weight_set(objects[i], 0, 0);
32 break; 32 break;
33 case NONE_BUT_FILL: 33 case NONE_BUT_FILL:
34 efl_gfx_size_hint_align_set(data, -1, -1); 34 efl_gfx_hint_align_set(data, -1, -1);
35 for (int i = 0; i < CNT; i++) 35 for (int i = 0; i < CNT; i++)
36 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 36 efl_gfx_hint_weight_set(objects[i], 0, 0);
37 break; 37 break;
38 case EQUAL: 38 case EQUAL:
39 efl_gfx_size_hint_align_set(data, 0.5, 0.5); 39 efl_gfx_hint_align_set(data, 0.5, 0.5);
40 for (int i = 0; i < CNT; i++) 40 for (int i = 0; i < CNT; i++)
41 efl_gfx_size_hint_weight_set(objects[i], 1, 1); 41 efl_gfx_hint_weight_set(objects[i], 1, 1);
42 break; 42 break;
43 case ONE: 43 case ONE:
44 efl_gfx_size_hint_align_set(data, 0.5, 0.5); 44 efl_gfx_hint_align_set(data, 0.5, 0.5);
45 for (int i = 0; i < 6; i++) 45 for (int i = 0; i < 6; i++)
46 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 46 efl_gfx_hint_weight_set(objects[i], 0, 0);
47 efl_gfx_size_hint_weight_set(objects[6], 1, 1); 47 efl_gfx_hint_weight_set(objects[6], 1, 1);
48 for (int i = 7; i < CNT; i++) 48 for (int i = 7; i < CNT; i++)
49 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 49 efl_gfx_hint_weight_set(objects[i], 0, 0);
50 break; 50 break;
51 case TWO: 51 case TWO:
52 efl_gfx_size_hint_align_set(data, 0.5, 0.5); 52 efl_gfx_hint_align_set(data, 0.5, 0.5);
53 for (int i = 0; i < 5; i++) 53 for (int i = 0; i < 5; i++)
54 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 54 efl_gfx_hint_weight_set(objects[i], 0, 0);
55 efl_gfx_size_hint_weight_set(objects[5], 1, 1); 55 efl_gfx_hint_weight_set(objects[5], 1, 1);
56 efl_gfx_size_hint_weight_set(objects[6], 1, 1); 56 efl_gfx_hint_weight_set(objects[6], 1, 1);
57 for (int i = 7; i < CNT; i++) 57 for (int i = 7; i < CNT; i++)
58 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 58 efl_gfx_hint_weight_set(objects[i], 0, 0);
59 break; 59 break;
60 } 60 }
61} 61}
@@ -65,7 +65,7 @@ user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event)
65{ 65{
66 int val = elm_slider_value_get(event->object); 66 int val = elm_slider_value_get(event->object);
67 67
68 efl_gfx_size_hint_min_set(objects[3], EINA_SIZE2D(val, val)); 68 efl_gfx_hint_size_min_set(objects[3], EINA_SIZE2D(val, val));
69} 69}
70 70
71static void 71static void
@@ -85,7 +85,7 @@ margin_slider_cb(void *data, const Efl_Event *event)
85 Eo *win = data, *box; 85 Eo *win = data, *box;
86 86
87 box = efl_key_wref_get(win, "box"); 87 box = efl_key_wref_get(win, "box");
88 efl_gfx_size_hint_margin_set(box, val, val, val, val); 88 efl_gfx_hint_margin_set(box, val, val, val, val);
89} 89}
90 90
91static void 91static void
@@ -120,8 +120,8 @@ alignh_btn_slider_cb(void *data, const Efl_Event *event)
120 120
121 btn = efl_key_wref_get(win, "button"); 121 btn = efl_key_wref_get(win, "button");
122 val = elm_slider_value_get(event->object); 122 val = elm_slider_value_get(event->object);
123 efl_gfx_size_hint_align_get(btn, NULL, &av); 123 efl_gfx_hint_align_get(btn, NULL, &av);
124 efl_gfx_size_hint_align_set(btn, val, av); 124 efl_gfx_hint_align_set(btn, val, av);
125} 125}
126 126
127static void 127static void
@@ -132,8 +132,8 @@ alignv_btn_slider_cb(void *data, const Efl_Event *event)
132 132
133 btn = efl_key_wref_get(win, "button"); 133 btn = efl_key_wref_get(win, "button");
134 val = elm_slider_value_get(event->object); 134 val = elm_slider_value_get(event->object);
135 efl_gfx_size_hint_align_get(btn, &ah, NULL); 135 efl_gfx_hint_align_get(btn, &ah, NULL);
136 efl_gfx_size_hint_align_set(btn, ah, val); 136 efl_gfx_hint_align_set(btn, ah, val);
137} 137}
138 138
139static void 139static void
@@ -209,7 +209,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
209 209
210 r.x = (rp.w / count) * i; 210 r.x = (rp.w / count) * i;
211 r.y = (rp.h / count) * i; 211 r.y = (rp.h / count) * i;
212 r.size = efl_gfx_size_hint_combined_min_get(sobj); 212 r.size = efl_gfx_hint_size_combined_min_get(sobj);
213 efl_gfx_entity_geometry_set(sobj, r); 213 efl_gfx_entity_geometry_set(sobj, r);
214 i++; 214 i++;
215 } 215 }
@@ -248,15 +248,15 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
248 vbox = efl_add(EFL_UI_BOX_CLASS, win, 248 vbox = efl_add(EFL_UI_BOX_CLASS, win,
249 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 249 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
250 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 250 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
251 efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); 251 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
252 elm_win_resize_object_add(win, vbox); 252 elm_win_resize_object_add(win, vbox);
253 253
254 254
255 /* controls */ 255 /* controls */
256 f = elm_frame_add(win); 256 f = elm_frame_add(win);
257 elm_object_text_set(f, "Controls"); 257 elm_object_text_set(f, "Controls");
258 efl_gfx_size_hint_align_set(f, -1, -1); 258 efl_gfx_hint_align_set(f, -1, -1);
259 efl_gfx_size_hint_weight_set(f, 1, 0); 259 efl_gfx_hint_weight_set(f, 1, 0);
260 efl_pack(vbox, f); 260 efl_pack(vbox, f);
261 efl_gfx_entity_visible_set(f, 1); 261 efl_gfx_entity_visible_set(f, 1);
262 262
@@ -269,14 +269,14 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
269 /* weights radio group */ 269 /* weights radio group */
270 bx = efl_add(EFL_UI_BOX_CLASS, win, 270 bx = efl_add(EFL_UI_BOX_CLASS, win,
271 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 271 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
272 efl_gfx_size_hint_align_set(bx, 0, 0.5); 272 efl_gfx_hint_align_set(bx, 0, 0.5);
273 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 273 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
274 efl_pack(hbox, bx); 274 efl_pack(hbox, bx);
275 275
276 chk = o = elm_radio_add(win); 276 chk = o = elm_radio_add(win);
277 elm_object_text_set(o, "No weight"); 277 elm_object_text_set(o, "No weight");
278 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); 278 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win);
279 efl_gfx_size_hint_align_set(o, 0, 0.5); 279 efl_gfx_hint_align_set(o, 0, 0.5);
280 elm_radio_state_value_set(o, NONE); 280 elm_radio_state_value_set(o, NONE);
281 efl_pack(bx, o); 281 efl_pack(bx, o);
282 efl_gfx_entity_visible_set(o, 1); 282 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
284 o = elm_radio_add(win); 284 o = elm_radio_add(win);
285 elm_object_text_set(o, "No weight + box fill"); 285 elm_object_text_set(o, "No weight + box fill");
286 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); 286 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win);
287 efl_gfx_size_hint_align_set(o, 0, 0.5); 287 efl_gfx_hint_align_set(o, 0, 0.5);
288 elm_radio_state_value_set(o, NONE_BUT_FILL); 288 elm_radio_state_value_set(o, NONE_BUT_FILL);
289 elm_radio_group_add(o, chk); 289 elm_radio_group_add(o, chk);
290 efl_pack(bx, o); 290 efl_pack(bx, o);
@@ -293,7 +293,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
293 o = elm_radio_add(win); 293 o = elm_radio_add(win);
294 elm_object_text_set(o, "Equal weights"); 294 elm_object_text_set(o, "Equal weights");
295 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); 295 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win);
296 efl_gfx_size_hint_align_set(o, 0, 0.5); 296 efl_gfx_hint_align_set(o, 0, 0.5);
297 elm_radio_state_value_set(o, EQUAL); 297 elm_radio_state_value_set(o, EQUAL);
298 elm_radio_group_add(o, chk); 298 elm_radio_group_add(o, chk);
299 efl_pack(bx, o); 299 efl_pack(bx, o);
@@ -302,7 +302,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
302 o = elm_radio_add(win); 302 o = elm_radio_add(win);
303 elm_object_text_set(o, "One weight only"); 303 elm_object_text_set(o, "One weight only");
304 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); 304 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win);
305 efl_gfx_size_hint_align_set(o, 0, 0.5); 305 efl_gfx_hint_align_set(o, 0, 0.5);
306 elm_radio_state_value_set(o, ONE); 306 elm_radio_state_value_set(o, ONE);
307 elm_radio_group_add(o, chk); 307 elm_radio_group_add(o, chk);
308 efl_pack(bx, o); 308 efl_pack(bx, o);
@@ -311,7 +311,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
311 o = elm_radio_add(win); 311 o = elm_radio_add(win);
312 elm_object_text_set(o, "Two weights"); 312 elm_object_text_set(o, "Two weights");
313 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); 313 efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win);
314 efl_gfx_size_hint_align_set(o, 0, 0.5); 314 efl_gfx_hint_align_set(o, 0, 0.5);
315 elm_radio_state_value_set(o, TWO); 315 elm_radio_state_value_set(o, TWO);
316 elm_radio_group_add(o, chk); 316 elm_radio_group_add(o, chk);
317 efl_pack(bx, o); 317 efl_pack(bx, o);
@@ -323,9 +323,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
323 /* misc */ 323 /* misc */
324 bx = efl_add(EFL_UI_BOX_CLASS, win, 324 bx = efl_add(EFL_UI_BOX_CLASS, win,
325 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 325 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
326 efl_gfx_size_hint_align_set(bx, 0, 0.5); 326 efl_gfx_hint_align_set(bx, 0, 0.5);
327 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 327 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
328 efl_gfx_size_hint_weight_set(bx, 0, 1); 328 efl_gfx_hint_weight_set(bx, 0, 1);
329 efl_pack(hbox, bx); 329 efl_pack(hbox, bx);
330 330
331 o = elm_label_add(win); 331 o = elm_label_add(win);
@@ -337,7 +337,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
337 elm_check_selected_set(o, 0); 337 elm_check_selected_set(o, 0);
338 elm_object_text_set(o, "Flow"); 338 elm_object_text_set(o, "Flow");
339 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win); 339 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win);
340 efl_gfx_size_hint_align_set(o, 0, 0); 340 efl_gfx_hint_align_set(o, 0, 0);
341 efl_pack(bx, o); 341 efl_pack(bx, o);
342 efl_gfx_entity_visible_set(o, 1); 342 efl_gfx_entity_visible_set(o, 1);
343 343
@@ -345,7 +345,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
345 elm_check_selected_set(o, 1); 345 elm_check_selected_set(o, 1);
346 elm_object_text_set(o, "Horizontal"); 346 elm_object_text_set(o, "Horizontal");
347 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win); 347 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win);
348 efl_gfx_size_hint_align_set(o, 0, 0); 348 efl_gfx_hint_align_set(o, 0, 0);
349 efl_pack(bx, o); 349 efl_pack(bx, o);
350 efl_gfx_entity_visible_set(o, 1); 350 efl_gfx_entity_visible_set(o, 1);
351 351
@@ -353,7 +353,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
353 elm_check_selected_set(o, 0); 353 elm_check_selected_set(o, 0);
354 elm_object_text_set(o, "Homogenous"); 354 elm_object_text_set(o, "Homogenous");
355 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win); 355 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win);
356 efl_gfx_size_hint_align_set(o, 0, 0); 356 efl_gfx_hint_align_set(o, 0, 0);
357 efl_pack(bx, o); 357 efl_pack(bx, o);
358 efl_gfx_entity_visible_set(o, 1); 358 efl_gfx_entity_visible_set(o, 1);
359 359
@@ -361,7 +361,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
361 elm_check_selected_set(o, 0); 361 elm_check_selected_set(o, 0);
362 elm_object_text_set(o, "Homogenous + Max"); 362 elm_object_text_set(o, "Homogenous + Max");
363 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win); 363 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win);
364 efl_gfx_size_hint_align_set(o, 0, 0); 364 efl_gfx_hint_align_set(o, 0, 0);
365 efl_pack(bx, o); 365 efl_pack(bx, o);
366 efl_gfx_entity_visible_set(o, 1); 366 efl_gfx_entity_visible_set(o, 1);
367 367
@@ -369,8 +369,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
369 elm_check_selected_set(o, 0); 369 elm_check_selected_set(o, 0);
370 elm_object_text_set(o, "Custom layout"); 370 elm_object_text_set(o, "Custom layout");
371 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, win); 371 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, win);
372 efl_gfx_size_hint_align_set(o, 0, 0); 372 efl_gfx_hint_align_set(o, 0, 0);
373 efl_gfx_size_hint_weight_set(o, 0, 1); 373 efl_gfx_hint_weight_set(o, 0, 1);
374 efl_pack(bx, o); 374 efl_pack(bx, o);
375 efl_gfx_entity_visible_set(o, 1); 375 efl_gfx_entity_visible_set(o, 1);
376 376
@@ -378,9 +378,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
378 /* user min size setter */ 378 /* user min size setter */
379 bx = efl_add(EFL_UI_BOX_CLASS, win, 379 bx = efl_add(EFL_UI_BOX_CLASS, win,
380 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 380 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
381 efl_gfx_size_hint_align_set(bx, 0, 0.5); 381 efl_gfx_hint_align_set(bx, 0, 0.5);
382 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 382 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
383 efl_gfx_size_hint_weight_set(bx, 0, 1); 383 efl_gfx_hint_weight_set(bx, 0, 1);
384 efl_pack(hbox, bx); 384 efl_pack(hbox, bx);
385 385
386 o = elm_label_add(win); 386 o = elm_label_add(win);
@@ -392,8 +392,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
392 elm_slider_indicator_format_set(o, "%.0fpx"); 392 elm_slider_indicator_format_set(o, "%.0fpx");
393 elm_slider_indicator_show_set(o, 1); 393 elm_slider_indicator_show_set(o, 1);
394 elm_slider_horizontal_set(o, 0); 394 elm_slider_horizontal_set(o, 0);
395 efl_gfx_size_hint_align_set(o, 0.5, -1); 395 efl_gfx_hint_align_set(o, 0.5, -1);
396 efl_gfx_size_hint_weight_set(o, 1, 1); 396 efl_gfx_hint_weight_set(o, 1, 1);
397 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); 397 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
398 elm_slider_min_max_set(o, 0, 250); 398 elm_slider_min_max_set(o, 0, 250);
399 elm_slider_inverted_set(o, 1); 399 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
405 /* inner box padding */ 405 /* inner box padding */
406 bx = efl_add(EFL_UI_BOX_CLASS, win, 406 bx = efl_add(EFL_UI_BOX_CLASS, win,
407 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 407 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
408 efl_gfx_size_hint_align_set(bx, 0, 0.5); 408 efl_gfx_hint_align_set(bx, 0, 0.5);
409 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 409 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
410 efl_gfx_size_hint_weight_set(bx, 0, 1); 410 efl_gfx_hint_weight_set(bx, 0, 1);
411 efl_pack(hbox, bx); 411 efl_pack(hbox, bx);
412 412
413 o = elm_label_add(win); 413 o = elm_label_add(win);
@@ -419,8 +419,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
419 elm_slider_indicator_format_set(o, "%.0fpx"); 419 elm_slider_indicator_format_set(o, "%.0fpx");
420 elm_slider_indicator_show_set(o, 1); 420 elm_slider_indicator_show_set(o, 1);
421 elm_slider_horizontal_set(o, 0); 421 elm_slider_horizontal_set(o, 0);
422 efl_gfx_size_hint_align_set(o, 0.5, -1); 422 efl_gfx_hint_align_set(o, 0.5, -1);
423 efl_gfx_size_hint_weight_set(o, 1, 1); 423 efl_gfx_hint_weight_set(o, 1, 1);
424 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win); 424 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win);
425 elm_slider_min_max_set(o, 0, 40); 425 elm_slider_min_max_set(o, 0, 40);
426 elm_slider_inverted_set(o, 1); 426 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
432 /* outer margin */ 432 /* outer margin */
433 bx = efl_add(EFL_UI_BOX_CLASS, win, 433 bx = efl_add(EFL_UI_BOX_CLASS, win,
434 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 434 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
435 efl_gfx_size_hint_align_set(bx, 0, 0.5); 435 efl_gfx_hint_align_set(bx, 0, 0.5);
436 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 436 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
437 efl_gfx_size_hint_weight_set(bx, 0, 1); 437 efl_gfx_hint_weight_set(bx, 0, 1);
438 efl_pack(hbox, bx); 438 efl_pack(hbox, bx);
439 439
440 o = elm_label_add(win); 440 o = elm_label_add(win);
@@ -446,8 +446,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
446 elm_slider_indicator_format_set(o, "%.0fpx"); 446 elm_slider_indicator_format_set(o, "%.0fpx");
447 elm_slider_indicator_show_set(o, 1); 447 elm_slider_indicator_show_set(o, 1);
448 elm_slider_horizontal_set(o, 0); 448 elm_slider_horizontal_set(o, 0);
449 efl_gfx_size_hint_align_set(o, 0.5, -1); 449 efl_gfx_hint_align_set(o, 0.5, -1);
450 efl_gfx_size_hint_weight_set(o, 1, 1); 450 efl_gfx_hint_weight_set(o, 1, 1);
451 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win); 451 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win);
452 elm_slider_min_max_set(o, 0, 40); 452 elm_slider_min_max_set(o, 0, 40);
453 elm_slider_inverted_set(o, 1); 453 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
459 /* Box align */ 459 /* Box align */
460 bx = efl_add(EFL_UI_BOX_CLASS, win, 460 bx = efl_add(EFL_UI_BOX_CLASS, win,
461 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 461 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
462 efl_gfx_size_hint_align_set(bx, 0, 0.5); 462 efl_gfx_hint_align_set(bx, 0, 0.5);
463 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 463 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
464 efl_gfx_size_hint_weight_set(bx, 1, 1); 464 efl_gfx_hint_weight_set(bx, 1, 1);
465 efl_pack(hbox, bx); 465 efl_pack(hbox, bx);
466 466
467 o = elm_label_add(win); 467 o = elm_label_add(win);
@@ -473,8 +473,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
473 elm_slider_indicator_format_set(o, "%.1f"); 473 elm_slider_indicator_format_set(o, "%.1f");
474 elm_slider_indicator_show_set(o, 1); 474 elm_slider_indicator_show_set(o, 1);
475 elm_slider_horizontal_set(o, 0); 475 elm_slider_horizontal_set(o, 0);
476 efl_gfx_size_hint_align_set(o, 0.5, -1); 476 efl_gfx_hint_align_set(o, 0.5, -1);
477 efl_gfx_size_hint_weight_set(o, 1, 1); 477 efl_gfx_hint_weight_set(o, 1, 1);
478 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win); 478 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win);
479 elm_slider_min_max_set(o, -0.1, 1.0); 479 elm_slider_min_max_set(o, -0.1, 1.0);
480 elm_slider_step_set(o, 0.1); 480 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
486 elm_slider_indicator_format_set(o, "%.1f"); 486 elm_slider_indicator_format_set(o, "%.1f");
487 elm_slider_indicator_show_set(o, 1); 487 elm_slider_indicator_show_set(o, 1);
488 elm_slider_horizontal_set(o, 1); 488 elm_slider_horizontal_set(o, 1);
489 efl_gfx_size_hint_align_set(o, 0.5, -1); 489 efl_gfx_hint_align_set(o, 0.5, -1);
490 efl_gfx_size_hint_weight_set(o, 1, 0); 490 efl_gfx_hint_weight_set(o, 1, 0);
491 efl_gfx_size_hint_min_set(o, EINA_SIZE2D(100, 0)); 491 efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0));
492 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win); 492 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win);
493 elm_slider_min_max_set(o, -0.1, 1.0); 493 elm_slider_min_max_set(o, -0.1, 1.0);
494 elm_slider_step_set(o, 0.1); 494 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
499 /* Button align */ 499 /* Button align */
500 bx = efl_add(EFL_UI_BOX_CLASS, win, 500 bx = efl_add(EFL_UI_BOX_CLASS, win,
501 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 501 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
502 efl_gfx_size_hint_align_set(bx, 0, 0.5); 502 efl_gfx_hint_align_set(bx, 0, 0.5);
503 efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 503 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
504 efl_gfx_size_hint_weight_set(bx, 1, 1); 504 efl_gfx_hint_weight_set(bx, 1, 1);
505 efl_pack(hbox, bx); 505 efl_pack(hbox, bx);
506 506
507 o = elm_label_add(win); 507 o = elm_label_add(win);
@@ -513,8 +513,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
513 elm_slider_indicator_format_set(o, "%.1f"); 513 elm_slider_indicator_format_set(o, "%.1f");
514 elm_slider_indicator_show_set(o, 1); 514 elm_slider_indicator_show_set(o, 1);
515 elm_slider_horizontal_set(o, 0); 515 elm_slider_horizontal_set(o, 0);
516 efl_gfx_size_hint_align_set(o, 0.5, -1); 516 efl_gfx_hint_align_set(o, 0.5, -1);
517 efl_gfx_size_hint_weight_set(o, 1, 1); 517 efl_gfx_hint_weight_set(o, 1, 1);
518 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_btn_slider_cb, win); 518 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_btn_slider_cb, win);
519 elm_slider_min_max_set(o, 0.0, 1.0); 519 elm_slider_min_max_set(o, 0.0, 1.0);
520 elm_slider_step_set(o, 0.1); 520 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
526 elm_slider_indicator_format_set(o, "%.1f"); 526 elm_slider_indicator_format_set(o, "%.1f");
527 elm_slider_indicator_show_set(o, 1); 527 elm_slider_indicator_show_set(o, 1);
528 elm_slider_horizontal_set(o, 1); 528 elm_slider_horizontal_set(o, 1);
529 efl_gfx_size_hint_align_set(o, 0.5, -1); 529 efl_gfx_hint_align_set(o, 0.5, -1);
530 efl_gfx_size_hint_weight_set(o, 1, 0); 530 efl_gfx_hint_weight_set(o, 1, 0);
531 efl_gfx_size_hint_min_set(o, EINA_SIZE2D(100, 0)); 531 efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0));
532 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_btn_slider_cb, win); 532 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_btn_slider_cb, win);
533 elm_slider_min_max_set(o, -0.1, 1.0); 533 elm_slider_min_max_set(o, -0.1, 1.0);
534 elm_slider_step_set(o, 0.1); 534 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
540 /* contents */ 540 /* contents */
541 f = elm_frame_add(win); 541 f = elm_frame_add(win);
542 elm_object_text_set(f, "Contents"); 542 elm_object_text_set(f, "Contents");
543 efl_gfx_size_hint_align_set(f, -1, -1); 543 efl_gfx_hint_align_set(f, -1, -1);
544 efl_gfx_size_hint_weight_set(f, 1, 1); 544 efl_gfx_hint_weight_set(f, 1, 1);
545 efl_pack(vbox, f); 545 efl_pack(vbox, f);
546 efl_gfx_entity_visible_set(f, 1); 546 efl_gfx_entity_visible_set(f, 1);
547 547
@@ -549,82 +549,82 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
549 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 549 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
550 efl_key_wref_set(win, "box", bx); 550 efl_key_wref_set(win, "box", bx);
551 efl_pack_padding_set(bx, 10, 10, EINA_TRUE); 551 efl_pack_padding_set(bx, 10, 10, EINA_TRUE);
552 efl_gfx_size_hint_align_set(bx, 0.5, 0.5); 552 efl_gfx_hint_align_set(bx, 0.5, 0.5);
553 efl_gfx_size_hint_weight_set(bx, 1, 1); 553 efl_gfx_hint_weight_set(bx, 1, 1);
554 efl_content_set(f, bx); 554 efl_content_set(f, bx);
555 555
556 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 556 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
557 efl_text_set(o, "Btn1"); 557 efl_text_set(o, "Btn1");
558 efl_gfx_size_hint_weight_set(o, 0, 0); 558 efl_gfx_hint_weight_set(o, 0, 0);
559 efl_gfx_size_hint_align_set(o, 0.5, 0.5); 559 efl_gfx_hint_align_set(o, 0.5, 0.5);
560 efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 560 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
561 efl_pack(bx, o); 561 efl_pack(bx, o);
562 efl_gfx_entity_visible_set(o, 1); 562 efl_gfx_entity_visible_set(o, 1);
563 563
564 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 564 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
565 efl_text_set(o, "Button 2"); 565 efl_text_set(o, "Button 2");
566 efl_gfx_size_hint_weight_set(o, 0, 0); 566 efl_gfx_hint_weight_set(o, 0, 0);
567 efl_pack(bx, o); 567 efl_pack(bx, o);
568 efl_gfx_entity_visible_set(o, 1); 568 efl_gfx_entity_visible_set(o, 1);
569 569
570 objects[i++] = o = elm_label_add(win); 570 objects[i++] = o = elm_label_add(win);
571 elm_label_line_wrap_set(o, ELM_WRAP_WORD); 571 elm_label_line_wrap_set(o, ELM_WRAP_WORD);
572 elm_object_text_set(o, "This label is not marked as fill"); 572 elm_object_text_set(o, "This label is not marked as fill");
573 efl_gfx_size_hint_align_set(o, 0.5, 0.5); 573 efl_gfx_hint_align_set(o, 0.5, 0.5);
574 efl_pack(bx, o); 574 efl_pack(bx, o);
575 efl_gfx_entity_visible_set(o, 1); 575 efl_gfx_entity_visible_set(o, 1);
576 576
577 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 577 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
578 efl_text_set(o, "Min size"); 578 efl_text_set(o, "Min size");
579 efl_gfx_size_hint_weight_set(o, 0, 0); 579 efl_gfx_hint_weight_set(o, 0, 0);
580 efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 580 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
581 efl_gfx_size_hint_align_set(o, 0.5, 1.0); 581 efl_gfx_hint_align_set(o, 0.5, 1.0);
582 efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); 582 efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
583 efl_pack(bx, o); 583 efl_pack(bx, o);
584 efl_gfx_entity_visible_set(o, 1); 584 efl_gfx_entity_visible_set(o, 1);
585 585
586 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 586 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
587 efl_text_set(o, "Quit!"); 587 efl_text_set(o, "Quit!");
588 efl_gfx_size_hint_weight_set(o, 0, 0); 588 efl_gfx_hint_weight_set(o, 0, 0);
589 efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 589 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
590 efl_gfx_size_hint_align_set(o, 0.5, 0.0); 590 efl_gfx_hint_align_set(o, 0.5, 0.0);
591 efl_pack(bx, o); 591 efl_pack(bx, o);
592 efl_gfx_entity_visible_set(o, 1); 592 efl_gfx_entity_visible_set(o, 1);
593 593
594 objects[i++] = o = elm_label_add(win); 594 objects[i++] = o = elm_label_add(win);
595 elm_label_line_wrap_set(o, ELM_WRAP_WORD); 595 elm_label_line_wrap_set(o, ELM_WRAP_WORD);
596 elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill."); 596 elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill.");
597 efl_gfx_size_hint_align_set(o, -1, -1); 597 efl_gfx_hint_align_set(o, -1, -1);
598 efl_pack(bx, o); 598 efl_pack(bx, o);
599 efl_gfx_entity_visible_set(o, 1); 599 efl_gfx_entity_visible_set(o, 1);
600 600
601 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 601 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
602 efl_key_wref_set(win, "button", o); 602 efl_key_wref_set(win, "button", o);
603 efl_text_set(o, "Button with a quite long text."); 603 efl_text_set(o, "Button with a quite long text.");
604 efl_gfx_size_hint_weight_set(o, 0, 0); 604 efl_gfx_hint_weight_set(o, 0, 0);
605 efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100)); 605 efl_gfx_hint_size_max_set(o, EINA_SIZE2D(200, 100));
606 efl_pack(bx, o); 606 efl_pack(bx, o);
607 efl_gfx_entity_visible_set(o, 1); 607 efl_gfx_entity_visible_set(o, 1);
608 608
609 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 609 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
610 efl_text_set(o, "BtnA"); 610 efl_text_set(o, "BtnA");
611 efl_gfx_size_hint_weight_set(o, 0, 0); 611 efl_gfx_hint_weight_set(o, 0, 0);
612 efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 612 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
613 efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); 613 efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2));
614 efl_pack(bx, o); 614 efl_pack(bx, o);
615 efl_gfx_entity_visible_set(o, 1); 615 efl_gfx_entity_visible_set(o, 1);
616 616
617 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 617 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
618 efl_text_set(o, "BtnB"); 618 efl_text_set(o, "BtnB");
619 efl_gfx_size_hint_weight_set(o, 0, 0); 619 efl_gfx_hint_weight_set(o, 0, 0);
620 efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 620 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
621 efl_pack(bx, o); 621 efl_pack(bx, o);
622 efl_gfx_entity_visible_set(o, 1); 622 efl_gfx_entity_visible_set(o, 1);
623 623
624 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); 624 objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx);
625 efl_text_set(o, "BtnC"); 625 efl_text_set(o, "BtnC");
626 efl_gfx_size_hint_weight_set(o, 0, 0); 626 efl_gfx_hint_weight_set(o, 0, 0);
627 efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 627 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
628 efl_pack(bx, o); 628 efl_pack(bx, o);
629 efl_gfx_entity_visible_set(o, 1); 629 efl_gfx_entity_visible_set(o, 1);
630 630
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_
54 54
55 bx = efl_add(EFL_UI_BOX_CLASS, win, 55 bx = efl_add(EFL_UI_BOX_CLASS, win,
56 efl_content_set(win, efl_added), 56 efl_content_set(win, efl_added),
57 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(360, 240))); 57 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240)));
58 58
59 dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, 59 dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx,
60 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 60 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
61 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 61 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
62 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), 62 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE),
63 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), 63 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE),
64 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), 64 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_
69 efl_pack(bx, efl_added)); 69 efl_pack(bx, efl_added));
70 70
71 dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, 71 dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx,
72 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 72 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
73 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 73 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
74 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), 74 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE),
75 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), 75 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE),
76 efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), 76 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_
80 elm_object_disabled_set(dt2, EINA_TRUE); 80 elm_object_disabled_set(dt2, EINA_TRUE);
81 81
82 dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, 82 dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx,
83 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 83 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
84 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 84 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
85 efl_pack(bx, efl_added)); 85 efl_pack(bx, efl_added));
86 86
87 efl_add(EFL_UI_TEXT_CLASS, bx, 87 efl_add(EFL_UI_TEXT_CLASS, bx,
88 efl_text_set(efl_added, "Editable Clock:"), 88 efl_text_set(efl_added, "Editable Clock:"),
89 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), 89 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
90 efl_gfx_size_hint_align_set(efl_added, 0, 0.5), 90 efl_gfx_hint_align_set(efl_added, 0, 0.5),
91 efl_gfx_size_hint_fill_set(efl_added, EINA_FALSE, EINA_TRUE), 91 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_TRUE),
92 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 25)), 92 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)),
93 efl_pack(bx, efl_added)); 93 efl_pack(bx, efl_added));
94 94
95 dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, 95 dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx,
96 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 96 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
97 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 97 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
98 efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), 98 efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE),
99 efl_ui_clock_pause_set(efl_added, EINA_TRUE), 99 efl_ui_clock_pause_set(efl_added, EINA_TRUE),
100 efl_pack(bx, efl_added)); 100 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)
80 page = efl_add(EFL_UI_LAYOUT_CLASS, parent, 80 page = efl_add(EFL_UI_LAYOUT_CLASS, parent,
81 efl_file_set(efl_added, buf, "page"), 81 efl_file_set(efl_added, buf, "page"),
82 efl_text_set(efl_part(efl_added, "text"), "Layout Page")); 82 efl_text_set(efl_part(efl_added, "text"), "Layout Page"));
83 efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 83 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
84 break; 84 break;
85 case LIST: 85 case LIST:
86 page = elm_list_add(parent); 86 page = elm_list_add(parent);
@@ -98,7 +98,7 @@ static Eo *page_add(Page_Type p, Eo *parent)
98 case BUTTON: 98 case BUTTON:
99 page = efl_add(EFL_UI_BUTTON_CLASS, parent, 99 page = efl_add(EFL_UI_BUTTON_CLASS, parent,
100 efl_text_set(efl_added, "Button Page")); 100 efl_text_set(efl_added, "Button Page"));
101 efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 101 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
102 break; 102 break;
103 default: 103 default:
104 snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", 104 snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj",
@@ -106,7 +106,7 @@ static Eo *page_add(Page_Type p, Eo *parent)
106 page = efl_add(EFL_UI_LAYOUT_CLASS, parent, 106 page = efl_add(EFL_UI_LAYOUT_CLASS, parent,
107 efl_file_set(efl_added, buf, "page"), 107 efl_file_set(efl_added, buf, "page"),
108 efl_text_set(efl_part(efl_added, "text"), "Layout Page")); 108 efl_text_set(efl_part(efl_added, "text"), "Layout Page"));
109 efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 109 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
110 break; 110 break;
111 } 111 }
112 112
@@ -339,8 +339,8 @@ static void page_size_cb(void *data,
339 // Width 339 // Width
340 fr = elm_frame_add(box); 340 fr = elm_frame_add(box);
341 elm_object_text_set(fr, "Width"); 341 elm_object_text_set(fr, "Width");
342 efl_gfx_size_hint_align_set(fr, -1, -1); 342 efl_gfx_hint_align_set(fr, -1, -1);
343 efl_gfx_size_hint_weight_set(fr, 1, 1); 343 efl_gfx_hint_weight_set(fr, 1, 1);
344 efl_pack(box, fr); 344 efl_pack(box, fr);
345 efl_gfx_entity_visible_set(fr, 1); 345 efl_gfx_entity_visible_set(fr, 1);
346 346
@@ -355,7 +355,7 @@ static void page_size_cb(void *data,
355 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, 355 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox,
356 efl_ui_range_min_max_set(efl_added, 100, 200), 356 efl_ui_range_min_max_set(efl_added, 100, 200),
357 efl_ui_range_value_set(efl_added, params->w), 357 efl_ui_range_value_set(efl_added, params->w),
358 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), 358 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
359 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 359 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
360 width_slider_cb, params), 360 width_slider_cb, params),
361 efl_pack_end(inbox, efl_added)); 361 efl_pack_end(inbox, efl_added));
@@ -380,8 +380,8 @@ static void page_size_cb(void *data,
380 // Height 380 // Height
381 fr = elm_frame_add(box); 381 fr = elm_frame_add(box);
382 elm_object_text_set(fr, "Height"); 382 elm_object_text_set(fr, "Height");
383 efl_gfx_size_hint_align_set(fr, -1, -1); 383 efl_gfx_hint_align_set(fr, -1, -1);
384 efl_gfx_size_hint_weight_set(fr, 1, 1); 384 efl_gfx_hint_weight_set(fr, 1, 1);
385 efl_pack(box, fr); 385 efl_pack(box, fr);
386 efl_gfx_entity_visible_set(fr, 1); 386 efl_gfx_entity_visible_set(fr, 1);
387 387
@@ -396,7 +396,7 @@ static void page_size_cb(void *data,
396 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, 396 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox,
397 efl_ui_range_min_max_set(efl_added, 100, 300), 397 efl_ui_range_min_max_set(efl_added, 100, 300),
398 efl_ui_range_value_set(efl_added, params->h), 398 efl_ui_range_value_set(efl_added, params->h),
399 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), 399 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
400 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 400 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
401 height_slider_cb, params), 401 height_slider_cb, params),
402 efl_pack_end(inbox, efl_added)); 402 efl_pack_end(inbox, efl_added));
@@ -610,7 +610,7 @@ static void current_page_cb(void *data,
610 efl_pack_end(box, efl_added)); 610 efl_pack_end(box, efl_added));
611 611
612 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, 612 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box,
613 efl_gfx_size_hint_align_set(efl_added, -1, -1), 613 efl_gfx_hint_align_set(efl_added, -1, -1),
614 efl_pack_end(box, efl_added)); 614 efl_pack_end(box, efl_added));
615 615
616 if (efl_content_count(pager) > 0) 616 if (efl_content_count(pager) > 0)
@@ -679,7 +679,7 @@ void test_ui_pager(void *data EINA_UNUSED,
679 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 679 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
680 680
681 panes = efl_add(EFL_UI_PANES_CLASS, win, 681 panes = efl_add(EFL_UI_PANES_CLASS, win,
682 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 682 efl_gfx_hint_weight_set(efl_added, 1, 1),
683 efl_ui_panes_split_ratio_set(efl_added, 0.3), 683 efl_ui_panes_split_ratio_set(efl_added, 0.3),
684 efl_content_set(win, efl_added)); 684 efl_content_set(win, efl_added));
685 685
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)
85 page = efl_add(EFL_UI_LAYOUT_CLASS, parent, 85 page = efl_add(EFL_UI_LAYOUT_CLASS, parent,
86 efl_file_set(efl_added, buf, "page"), 86 efl_file_set(efl_added, buf, "page"),
87 efl_text_set(efl_part(efl_added, "text"), "Layout Page")); 87 efl_text_set(efl_part(efl_added, "text"), "Layout Page"));
88 efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 88 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
89 break; 89 break;
90 case LIST: 90 case LIST:
91 page = elm_list_add(parent); 91 page = elm_list_add(parent);
@@ -103,7 +103,7 @@ static Eo *page_add(Page_Type p, Eo *parent)
103 case BUTTON: 103 case BUTTON:
104 page = efl_add(EFL_UI_BUTTON_CLASS, parent, 104 page = efl_add(EFL_UI_BUTTON_CLASS, parent,
105 efl_text_set(efl_added, "Button Page")); 105 efl_text_set(efl_added, "Button Page"));
106 efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 106 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
107 break; 107 break;
108 default: 108 default:
109 snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", 109 snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj",
@@ -111,7 +111,7 @@ static Eo *page_add(Page_Type p, Eo *parent)
111 page = efl_add(EFL_UI_LAYOUT_CLASS, parent, 111 page = efl_add(EFL_UI_LAYOUT_CLASS, parent,
112 efl_file_set(efl_added, buf, "page"), 112 efl_file_set(efl_added, buf, "page"),
113 efl_text_set(efl_part(efl_added, "text"), "Layout Page")); 113 efl_text_set(efl_part(efl_added, "text"), "Layout Page"));
114 efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 114 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
115 break; 115 break;
116 } 116 }
117 117
@@ -395,8 +395,8 @@ static void page_size_cb(void *data,
395 // Width 395 // Width
396 fr = elm_frame_add(box); 396 fr = elm_frame_add(box);
397 elm_object_text_set(fr, "Width"); 397 elm_object_text_set(fr, "Width");
398 efl_gfx_size_hint_align_set(fr, -1, -1); 398 efl_gfx_hint_align_set(fr, -1, -1);
399 efl_gfx_size_hint_weight_set(fr, 1, 1); 399 efl_gfx_hint_weight_set(fr, 1, 1);
400 efl_pack(box, fr); 400 efl_pack(box, fr);
401 efl_gfx_entity_visible_set(fr, 1); 401 efl_gfx_entity_visible_set(fr, 1);
402 402
@@ -411,7 +411,7 @@ static void page_size_cb(void *data,
411 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, 411 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox,
412 efl_ui_range_min_max_set(efl_added, 100, 200), 412 efl_ui_range_min_max_set(efl_added, 100, 200),
413 efl_ui_range_value_set(efl_added, params->w), 413 efl_ui_range_value_set(efl_added, params->w),
414 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), 414 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
415 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 415 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
416 width_slider_cb, params), 416 width_slider_cb, params),
417 efl_pack_end(inbox, efl_added)); 417 efl_pack_end(inbox, efl_added));
@@ -436,8 +436,8 @@ static void page_size_cb(void *data,
436 // Height 436 // Height
437 fr = elm_frame_add(box); 437 fr = elm_frame_add(box);
438 elm_object_text_set(fr, "Height"); 438 elm_object_text_set(fr, "Height");
439 efl_gfx_size_hint_align_set(fr, -1, -1); 439 efl_gfx_hint_align_set(fr, -1, -1);
440 efl_gfx_size_hint_weight_set(fr, 1, 1); 440 efl_gfx_hint_weight_set(fr, 1, 1);
441 efl_pack(box, fr); 441 efl_pack(box, fr);
442 efl_gfx_entity_visible_set(fr, 1); 442 efl_gfx_entity_visible_set(fr, 1);
443 443
@@ -452,7 +452,7 @@ static void page_size_cb(void *data,
452 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, 452 sl = efl_add(EFL_UI_SLIDER_CLASS, inbox,
453 efl_ui_range_min_max_set(efl_added, 100, 300), 453 efl_ui_range_min_max_set(efl_added, 100, 300),
454 efl_ui_range_value_set(efl_added, params->h), 454 efl_ui_range_value_set(efl_added, params->h),
455 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), 455 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
456 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 456 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
457 height_slider_cb, params), 457 height_slider_cb, params),
458 efl_pack_end(inbox, efl_added)); 458 efl_pack_end(inbox, efl_added));
@@ -496,7 +496,7 @@ static void padding_cb(void *data,
496 efl_add(EFL_UI_SLIDER_CLASS, box, 496 efl_add(EFL_UI_SLIDER_CLASS, box,
497 efl_ui_range_min_max_set(efl_added, 0, 50), 497 efl_ui_range_min_max_set(efl_added, 0, 50),
498 efl_ui_range_value_set(efl_added, params->padding), 498 efl_ui_range_value_set(efl_added, params->padding),
499 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), 499 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
500 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 500 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
501 padding_slider_cb, params), 501 padding_slider_cb, params),
502 efl_pack_end(box, efl_added)); 502 efl_pack_end(box, efl_added));
@@ -526,8 +526,8 @@ static void side_page_num_cb(void *data,
526 efl_ui_range_min_max_set(efl_added, 0, 3), 526 efl_ui_range_min_max_set(efl_added, 0, 3),
527 efl_ui_range_value_set(efl_added, params->side_page_num), 527 efl_ui_range_value_set(efl_added, params->side_page_num),
528 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 528 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
529 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 529 efl_gfx_hint_weight_set(efl_added, 1, 1),
530 efl_gfx_size_hint_align_set(efl_added, -1, -1), 530 efl_gfx_hint_align_set(efl_added, -1, -1),
531 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 531 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
532 side_page_num_slider_cb, params), 532 side_page_num_slider_cb, params),
533 efl_pack_end(box, efl_added)); 533 efl_pack_end(box, efl_added));
@@ -724,7 +724,7 @@ static void current_page_cb(void *data,
724 efl_pack_end(box, efl_added)); 724 efl_pack_end(box, efl_added));
725 725
726 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, 726 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box,
727 efl_gfx_size_hint_align_set(efl_added, -1, -1), 727 efl_gfx_hint_align_set(efl_added, -1, -1),
728 efl_pack_end(box, efl_added)); 728 efl_pack_end(box, efl_added));
729 729
730 if (efl_content_count(pager) > 0) 730 if (efl_content_count(pager) > 0)
@@ -860,7 +860,7 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
860 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 860 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
861 861
862 panes = efl_add(EFL_UI_PANES_CLASS, win, 862 panes = efl_add(EFL_UI_PANES_CLASS, win,
863 efl_gfx_size_hint_weight_set(efl_added, 1, 1), 863 efl_gfx_hint_weight_set(efl_added, 1, 1),
864 efl_ui_panes_split_ratio_set(efl_added, 0.3), 864 efl_ui_panes_split_ratio_set(efl_added, 0.3),
865 efl_content_set(win, efl_added)); 865 efl_content_set(win, efl_added));
866 866
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_
20 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 20 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
21 efl_add(EFL_UI_IMAGE_CLASS, table, 21 efl_add(EFL_UI_IMAGE_CLASS, table,
22 efl_file_set(efl_added, buf, NULL), 22 efl_file_set(efl_added, buf, NULL),
23 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 23 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
24 efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 24 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
25 efl_pack_table(table, efl_added, 0, 0, 4, 5)); 25 efl_pack_table(table, efl_added, 0, 0, 4, 5));
26 26
27 // Top Panel 27 // Top Panel
@@ -114,17 +114,17 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
114 efl_ui_check_selected_set(efl_added, elm_config_scroll_thumbscroll_enabled_get()), 114 efl_ui_check_selected_set(efl_added, elm_config_scroll_thumbscroll_enabled_get()),
115 efl_text_set(efl_added, "Enable thumb scroll (temporarily"), 115 efl_text_set(efl_added, "Enable thumb scroll (temporarily"),
116 efl_event_callback_add(efl_added, EFL_UI_NSTATE_EVENT_CHANGED, _check_changed, NULL), 116 efl_event_callback_add(efl_added, EFL_UI_NSTATE_EVENT_CHANGED, _check_changed, NULL),
117 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), 117 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0),
118 efl_pack(box, efl_added)); 118 efl_pack(box, efl_added));
119 119
120 check = efl_add(EFL_UI_CHECK_CLASS, box, 120 check = efl_add(EFL_UI_CHECK_CLASS, box,
121 efl_text_set(efl_added, "Reset content on toggle"), 121 efl_text_set(efl_added, "Reset content on toggle"),
122 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), 122 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0),
123 efl_pack(box, efl_added)); 123 efl_pack(box, efl_added));
124 124
125 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 125 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
126 efl_text_set(efl_added, "toggle"), 126 efl_text_set(efl_added, "toggle"),
127 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), 127 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0),
128 efl_pack(box, efl_added)); 128 efl_pack(box, efl_added));
129 129
130 table = efl_add(EFL_UI_TABLE_CLASS, box, 130 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
21 21
22 efl_add(EFL_UI_BUTTON_CLASS, win, 22 efl_add(EFL_UI_BUTTON_CLASS, win,
23 efl_text_set(efl_added, "Left - user set min size(110,110)"), 23 efl_text_set(efl_added, "Left - user set min size(110,110)"),
24 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(110, 110)), 24 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(110, 110)),
25 efl_content_set(efl_part(panes, "first"), efl_added) 25 efl_content_set(efl_part(panes, "first"), efl_added)
26 ); 26 );
27 27
@@ -31,14 +31,14 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
31 ); 31 );
32 efl_add(EFL_UI_BUTTON_CLASS, win, 32 efl_add(EFL_UI_BUTTON_CLASS, win,
33 efl_text_set(efl_added, "Up - user set min size(10,0)"), 33 efl_text_set(efl_added, "Up - user set min size(10,0)"),
34 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(10, 0)), 34 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(10, 0)),
35 efl_content_set(efl_part(panes_h, "first"), efl_added) 35 efl_content_set(efl_part(panes_h, "first"), efl_added)
36 ); 36 );
37 efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); 37 efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE);
38 38
39 efl_add(EFL_UI_BUTTON_CLASS, win, 39 efl_add(EFL_UI_BUTTON_CLASS, win,
40 efl_text_set(efl_added, "Down - min size 50 40"), 40 efl_text_set(efl_added, "Down - min size 50 40"),
41 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(50, 40)), 41 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(50, 40)),
42 efl_content_set(efl_part(panes_h, "second"), efl_added) 42 efl_content_set(efl_part(panes_h, "second"), efl_added)
43 ); 43 );
44 44
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
1009 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); 1009 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
1010 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 1010 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
1011 efl_file_set(layout, buf, "efl_ui_anchor_popup_layout"); 1011 efl_file_set(layout, buf, "efl_ui_anchor_popup_layout");
1012 efl_gfx_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1012 efl_gfx_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1013 efl_content_set(win, layout); 1013 efl_content_set(win, layout);
1014 1014
1015 Eo *efl_ui_popup = efl_add(EFL_UI_ANCHOR_POPUP_CLASS, win); 1015 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
1034 { 1034 {
1035 btn = efl_add(EFL_UI_BUTTON_CLASS, win); 1035 btn = efl_add(EFL_UI_BUTTON_CLASS, win);
1036 efl_text_set(btn, "anchor"); 1036 efl_text_set(btn, "anchor");
1037 efl_gfx_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1037 efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1038 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); 1038 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup);
1039 1039
1040 snprintf(buf, sizeof(buf), "anchor%d", i+1); 1040 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
1043 1043
1044 btn = efl_add(EFL_UI_BUTTON_CLASS, win); 1044 btn = efl_add(EFL_UI_BUTTON_CLASS, win);
1045 efl_text_set(btn, "anchor none"); 1045 efl_text_set(btn, "anchor none");
1046 efl_gfx_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1046 efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1047 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); 1047 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup);
1048 efl_content_set(efl_part(layout, "anchor_none"), btn); 1048 efl_content_set(efl_part(layout, "anchor_none"), btn);
1049 1049
1050 Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); 1050 Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup);
1051 efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1051 efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1052 1052
1053 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1053 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1054 efl_text_set(btn, "Center Align"); 1054 efl_text_set(btn, "Center Align");
1055 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); 1055 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
1056 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); 1056 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
1057 efl_pack_table(table, btn, 0, 0, 2, 1); 1057 efl_pack_table(table, btn, 0, 0, 2, 1);
1058 1058
1059 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1059 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1060 efl_text_set(btn, "Top Align"); 1060 efl_text_set(btn, "Top Align");
1061 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); 1061 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
1062 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); 1062 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
1063 efl_pack_table(table, btn, 2, 0, 2, 1); 1063 efl_pack_table(table, btn, 2, 0, 2, 1);
1064 1064
1065 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1065 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1066 efl_text_set(btn, "Bottom Align"); 1066 efl_text_set(btn, "Bottom Align");
1067 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); 1067 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
1068 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); 1068 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
1069 efl_pack_table(table, btn, 4, 0, 2, 1); 1069 efl_pack_table(table, btn, 4, 0, 2, 1);
1070 1070
1071 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1071 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1072 efl_text_set(btn, "Left Align"); 1072 efl_text_set(btn, "Left Align");
1073 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); 1073 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1074 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); 1074 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
1075 efl_pack_table(table, btn, 0, 1, 3, 1); 1075 efl_pack_table(table, btn, 0, 1, 3, 1);
1076 1076
1077 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1077 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1078 efl_text_set(btn, "Right Align"); 1078 efl_text_set(btn, "Right Align");
1079 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); 1079 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1080 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); 1080 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
1081 efl_pack_table(table, btn, 3, 1, 3, 1); 1081 efl_pack_table(table, btn, 3, 1, 3, 1);
1082 1082
1083 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1083 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1084 efl_text_set(btn, "Position Set"); 1084 efl_text_set(btn, "Position Set");
1085 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); 1085 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1086 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); 1086 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
1087 efl_pack_table(table, btn, 0, 2, 3, 1); 1087 efl_pack_table(table, btn, 0, 2, 3, 1);
1088 1088
1089 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1089 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1090 efl_text_set(btn, "Resize"); 1090 efl_text_set(btn, "Resize");
1091 efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); 1091 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1092 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data); 1092 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data);
1093 efl_pack_table(table, btn, 3, 2, 3, 1); 1093 efl_pack_table(table, btn, 3, 2, 3, 1);
1094 1094
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
133 efl_pack(bx, efl_added), 133 efl_pack(bx, efl_added),
134 efl_text_set(efl_added, "percent"), 134 efl_text_set(efl_added, "percent"),
135 efl_ui_range_min_max_set(efl_added, 0, 100), 135 efl_ui_range_min_max_set(efl_added, 0, 100),
136 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20)) 136 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20))
137 ); 137 );
138 138
139 snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); 139 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
146 efl_pack(bx, efl_added), 146 efl_pack(bx, efl_added),
147 efl_text_set(efl_added, "10-100"), 147 efl_text_set(efl_added, "10-100"),
148 efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE), 148 efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE),
149 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20)), 149 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)),
150 efl_ui_range_min_max_set(efl_added, 10, 100), 150 efl_ui_range_min_max_set(efl_added, 10, 100),
151 efl_ui_range_value_set(efl_added, 10) 151 efl_ui_range_value_set(efl_added, 10)
152 ); 152 );
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
new file mode 100644
index 0000000000..24546cad14
--- /dev/null
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -0,0 +1,319 @@
1#include "test.h"
2#ifdef HAVE_CONFIG_H
3# include "elementary_config.h"
4#endif
5
6#include <Elementary.h>
7
8static Eo *layout, *btn1, *btn2, *btn3;
9
10typedef enum {
11 LEFT,
12 RIGHT,
13 TOP,
14 BOTTOM
15} Options;
16
17static void
18_btn_clicked_to_cb(void *data, const Efl_Event *event)
19{
20 Eo *to, *btn, *obj = event->object;
21 Options opt = (Options)data;
22 double relative;
23
24 btn = efl_key_wref_get(obj, "btn");
25 to = efl_key_wref_get(obj, "to");
26
27 do
28 {
29 if (to == layout)
30 to = btn1;
31 else if (to == btn1)
32 to = btn2;
33 else if (to == btn2)
34 to = btn3;
35 else if (to == btn3)
36 to = layout;
37 }
38 while (btn == to);
39 efl_key_wref_set(obj, "to", to);
40
41 switch (opt)
42 {
43 case LEFT:
44 efl_ui_relative_layout_relation_left_get(layout, btn, NULL, &relative);
45 efl_ui_relative_layout_relation_left_set(layout, btn, to, relative);
46 break;
47 case RIGHT:
48 efl_ui_relative_layout_relation_right_get(layout, btn, NULL, &relative);
49 efl_ui_relative_layout_relation_right_set(layout, btn, to, relative);
50 break;
51 case TOP:
52 efl_ui_relative_layout_relation_top_get(layout, btn, NULL, &relative);
53 efl_ui_relative_layout_relation_top_set(layout, btn, to, relative);
54 break;
55 case BOTTOM:
56 efl_ui_relative_layout_relation_bottom_get(layout, btn, NULL, &relative);
57 efl_ui_relative_layout_relation_bottom_set(layout, btn, to, relative);
58 break;
59 }
60 efl_text_set(obj, ((to == layout) ? "parent" : (char *)efl_text_get(to)));
61 efl_pack_layout_request(layout);
62}
63
64static void
65_slider_changed_relative_cb(void *data, const Efl_Event *event)
66{
67 Options opt = (Options)data;
68 Eo *btn, *slider = event->object;
69 double val;
70
71 btn = efl_key_wref_get(slider, "btn");
72 val = efl_ui_range_value_get(slider);
73
74 switch (opt)
75 {
76 case LEFT:
77 efl_ui_relative_layout_relation_left_set(layout, btn, NULL, val);
78 break;
79 case RIGHT:
80 efl_ui_relative_layout_relation_right_set(layout, btn, NULL, val);
81 break;
82 case TOP:
83 efl_ui_relative_layout_relation_top_set(layout, btn, NULL, val);
84 break;
85 case BOTTOM:
86 efl_ui_relative_layout_relation_bottom_set(layout, btn, NULL, val);
87 break;
88 }
89 efl_pack_layout_request(layout);
90}
91
92static void
93_slider_changed_align_cb(void *data, const Efl_Event *event)
94{
95 char opt = (char)(uintptr_t)data;
96 Eo *btn, *slider = event->object;
97 double val, x, y;
98
99 btn = efl_key_wref_get(slider, "btn");
100 val = efl_ui_range_value_get(slider);
101
102 efl_gfx_hint_align_get(btn, &x, &y);
103 if (opt == 'x')
104 efl_gfx_hint_align_set(btn, val, y);
105 else if (opt == 'y')
106 efl_gfx_hint_align_set(btn, x, val);
107
108 efl_pack_layout_request(layout);
109}
110
111static void
112_setter_add(Eo *vbox, Eo *btn, Options option)
113{
114 Eo *to, *hbox;
115 char *text = NULL, *btn_text;
116 double relative;
117
118 switch (option)
119 {
120 case LEFT:
121 text = "left";
122 efl_ui_relative_layout_relation_left_get(layout, btn, &to, &relative);
123 break;
124 case RIGHT:
125 text = "right";
126 efl_ui_relative_layout_relation_right_get(layout, btn, &to, &relative);
127 break;
128 case TOP:
129 text = "top";
130 efl_ui_relative_layout_relation_top_get(layout, btn, &to, &relative);
131 break;
132 case BOTTOM:
133 text = "bottom";
134 efl_ui_relative_layout_relation_bottom_get(layout, btn, &to, &relative);
135 break;
136 }
137 btn_text = ((to == layout) ? "parent" : (char *)efl_text_get(to));
138
139 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
140 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
141 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE),
142 efl_pack(vbox, efl_added));
143
144 efl_add(EFL_UI_TEXT_CLASS, hbox,
145 efl_text_set(efl_added, text),
146 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
147 efl_text_valign_set(efl_added, 0.5),
148 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
149 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
150 efl_pack(hbox, efl_added));
151
152 efl_add(EFL_UI_BUTTON_CLASS, hbox,
153 efl_text_set(efl_added, btn_text),
154 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(60, 0)),
155 efl_key_wref_set(efl_added, "to", to),
156 efl_key_wref_set(efl_added, "btn", btn),
157 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
158 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option),
159 efl_pack(hbox, efl_added));
160
161 efl_add(EFL_UI_SLIDER_CLASS, hbox,
162 efl_ui_range_min_max_set(efl_added, 0.0, 1.0),
163 efl_ui_range_step_set(efl_added, 0.1),
164 efl_ui_range_value_set(efl_added, relative),
165 efl_key_wref_set(efl_added, "btn", btn),
166 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_relative_cb, (void *)option),
167 efl_pack(hbox, efl_added));
168}
169
170static void
171_button_frame_add(Eo *box, Eo *btn)
172{
173 Eo *f, *vbox, *hbox;
174 double align_x, align_y;
175
176 f = efl_add(EFL_UI_FRAME_CLASS, box,
177 efl_text_set(efl_added, efl_text_get(btn)),
178 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
179 efl_pack(box, efl_added));
180
181 vbox = efl_add(EFL_UI_BOX_CLASS, f,
182 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
183 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE),
184 efl_gfx_hint_margin_set(efl_added, 2, 2, 2, 2),
185 efl_content_set(f, efl_added));
186
187 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
188 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
189 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE),
190 efl_pack(vbox, efl_added));
191
192 efl_add(EFL_CANVAS_RECTANGLE_CLASS, hbox,
193 efl_gfx_color_set(efl_added, 0, 0, 0, 0),
194 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
195 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
196 efl_pack(hbox, efl_added));
197
198 efl_add(EFL_UI_TEXT_CLASS, hbox,
199 efl_text_set(efl_added, "to"),
200 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
201 efl_text_halign_set(efl_added, 0.5),
202 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(60, 0)),
203 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
204 efl_pack(hbox, efl_added));
205
206 efl_add(EFL_UI_TEXT_CLASS, hbox,
207 efl_text_set(efl_added, "relative"),
208 efl_text_halign_set(efl_added, 0.5),
209 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
210 efl_pack(hbox, efl_added));
211
212 _setter_add(vbox, btn, LEFT);
213 _setter_add(vbox, btn, RIGHT);
214 _setter_add(vbox, btn, TOP);
215 _setter_add(vbox, btn, BOTTOM);
216
217 /* align setter */
218 efl_gfx_hint_align_get(btn, &align_x, &align_y);
219
220 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
221 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
222 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE),
223 efl_pack(vbox, efl_added));
224
225 efl_add(EFL_UI_TEXT_CLASS, hbox,
226 efl_text_set(efl_added, "align_x"),
227 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
228 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
229 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
230 efl_pack(hbox, efl_added));
231
232 efl_add(EFL_UI_SLIDER_CLASS, hbox,
233 efl_ui_range_min_max_set(efl_added, 0.0, 1.0),
234 efl_ui_range_step_set(efl_added, 0.1),
235 efl_ui_range_value_set(efl_added, align_x),
236 efl_key_wref_set(efl_added, "btn", btn),
237 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_align_cb, (void *)'x'),
238 efl_pack(hbox, efl_added));
239
240 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
241 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
242 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE),
243 efl_pack(vbox, efl_added));
244
245 efl_add(EFL_UI_TEXT_CLASS, hbox,
246 efl_text_set(efl_added, "align_y"),
247 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
248 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
249 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
250 efl_pack(hbox, efl_added));
251
252 efl_add(EFL_UI_SLIDER_CLASS, hbox,
253 efl_ui_range_min_max_set(efl_added, 0.0, 1.0),
254 efl_ui_range_step_set(efl_added, 0.1),
255 efl_ui_range_value_set(efl_added, align_y),
256 efl_key_wref_set(efl_added, "btn", btn),
257 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_align_cb, (void *)'y'),
258 efl_pack(hbox, efl_added));
259}
260
261void
262test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
263{
264 Eo *win, *vbox, *f, *hbox;
265
266 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
267 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
268 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
269 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
270
271 vbox = efl_add(EFL_UI_BOX_CLASS, win,
272 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
273 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE),
274 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5),
275 efl_content_set(win, efl_added));
276
277 /* controls */
278 f = efl_add(EFL_UI_FRAME_CLASS, vbox,
279 efl_text_set(efl_added, "Controls"),
280 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
281 efl_pack(vbox, efl_added));
282
283 hbox = efl_add(EFL_UI_BOX_CLASS, f,
284 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
285 efl_pack_padding_set(efl_added, 10, 0, EINA_TRUE),
286 efl_content_set(f, efl_added));
287
288 /* contents */
289 f = efl_add(EFL_UI_FRAME_CLASS, vbox,
290 efl_text_set(efl_added, "Contents"),
291 efl_pack(vbox, efl_added));
292
293 layout = efl_add(EFL_UI_RELATIVE_LAYOUT_CLASS, f,
294 efl_content_set(f, efl_added));
295
296 btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout,
297 efl_text_set(efl_added, "button1"),
298 efl_gfx_hint_align_set(efl_added, 0.0, 0.0),
299 efl_ui_relative_layout_relation_right_set(layout, efl_added, layout, 0.0),
300 efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0));
301
302 btn2 = efl_add(EFL_UI_BUTTON_CLASS, layout,
303 efl_text_set(efl_added, "button2"),
304 efl_gfx_hint_align_set(efl_added, 0.5, 0.0),
305 efl_ui_relative_layout_relation_left_set(layout, efl_added, btn1, 1.0),
306 efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0));
307
308 btn3 = efl_add(EFL_UI_BUTTON_CLASS, layout,
309 efl_text_set(efl_added, "button3"),
310 efl_ui_relative_layout_relation_left_set(layout, efl_added, btn2, 0.0),
311 efl_ui_relative_layout_relation_top_set(layout, efl_added, btn2, 1.0));
312
313 _button_frame_add(hbox, btn1);
314 _button_frame_add(hbox, btn2);
315 _button_frame_add(hbox, btn3);
316
317 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
318 efl_gfx_entity_visible_set(win, EINA_TRUE);
319}
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
37 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); 37 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
38 38
39 sc = efl_add(EFL_UI_SCROLLER_CLASS, win, 39 sc = efl_add(EFL_UI_SCROLLER_CLASS, win,
40 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 40 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
41 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), 41 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL),
42 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), 42 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL),
43 efl_content_set(win, efl_added)); 43 efl_content_set(win, efl_added));
44 44
45 bx = efl_add(EFL_UI_BOX_CLASS, sc, 45 bx = efl_add(EFL_UI_BOX_CLASS, sc,
46 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), 46 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN),
47 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), 47 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0),
48 efl_gfx_size_hint_align_set(efl_added, 0.5, 0), 48 efl_gfx_hint_align_set(efl_added, 0.5, 0),
49 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 49 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
50 efl_content_set(sc, efl_added)); 50 efl_content_set(sc, efl_added));
51 51
52 efl_add(EFL_UI_SLIDER_CLASS, bx, 52 efl_add(EFL_UI_SLIDER_CLASS, bx,
53 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), 53 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)),
54 efl_pack(bx, efl_added)); 54 efl_pack(bx, efl_added));
55 55
56 for (i = 0; i < 3; i++) 56 for (i = 0; i < 3; i++)
57 { 57 {
58 efl_add(EFL_UI_BUTTON_CLASS, bx, 58 efl_add(EFL_UI_BUTTON_CLASS, bx,
59 efl_text_set(efl_added, "Vertical"), 59 efl_text_set(efl_added, "Vertical"),
60 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 60 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
61 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 61 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
62 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 62 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
63 efl_pack(bx, efl_added)); 63 efl_pack(bx, efl_added));
64 } 64 }
@@ -83,25 +83,25 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
83 { 83 {
84 efl_add(EFL_UI_BUTTON_CLASS, bx, 84 efl_add(EFL_UI_BUTTON_CLASS, bx,
85 efl_text_set(efl_added, "Vertical"), 85 efl_text_set(efl_added, "Vertical"),
86 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 86 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
87 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 87 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
88 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 88 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
89 efl_pack(bx, efl_added)); 89 efl_pack(bx, efl_added));
90 } 90 }
91 91
92 gd = efl_add(EFL_UI_TABLE_CLASS, bx, 92 gd = efl_add(EFL_UI_TABLE_CLASS, bx,
93 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 93 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
94 efl_gfx_size_hint_align_set(efl_added, 0.5, 0), 94 efl_gfx_hint_align_set(efl_added, 0.5, 0),
95 efl_pack(bx, efl_added)); 95 efl_pack(bx, efl_added));
96 96
97 efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, 97 efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,
98 efl_gfx_color_set(efl_added, 0, 0, 0, 0), 98 efl_gfx_color_set(efl_added, 0, 0, 0, 0),
99 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(200, 120)), 99 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(200, 120)),
100 efl_pack_table(gd, efl_added, 0, 0, 1, 1)); 100 efl_pack_table(gd, efl_added, 0, 0, 1, 1));
101 101
102 sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win, 102 sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win,
103 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 103 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
104 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 104 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
105 efl_pack_table(gd, efl_added, 0, 0, 1, 1)); 105 efl_pack_table(gd, efl_added, 0, 0, 1, 1));
106 106
107 gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3, 107 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
122 { 122 {
123 efl_add(EFL_UI_BUTTON_CLASS, bx, 123 efl_add(EFL_UI_BUTTON_CLASS, bx,
124 efl_text_set(efl_added, "Vertical"), 124 efl_text_set(efl_added, "Vertical"),
125 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 125 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
126 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 126 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
127 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 127 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
128 efl_pack(bx, efl_added)); 128 efl_pack(bx, efl_added));
129 } 129 }
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
46 efl_pack(bx, efl_added)); 46 efl_pack(bx, efl_added));
47 47
48 efl_add(EFL_UI_SLIDER_CLASS, bx, 48 efl_add(EFL_UI_SLIDER_CLASS, bx,
49 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), 49 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)),
50 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 50 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
51 efl_pack(bx, efl_added)); 51 efl_pack(bx, efl_added));
52 52
53 efl_add(EFL_UI_TEXT_CLASS, bx, 53 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
56 efl_pack(bx, efl_added)); 56 efl_pack(bx, efl_added));
57 57
58 efl_add(EFL_UI_SLIDER_CLASS, bx, 58 efl_add(EFL_UI_SLIDER_CLASS, bx,
59 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), 59 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)),
60 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 60 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
61 efl_ui_direction_set(efl_added, EFL_UI_DIR_LEFT), 61 efl_ui_direction_set(efl_added, EFL_UI_DIR_LEFT),
62 efl_pack(bx, efl_added)); 62 efl_pack(bx, efl_added));
63 63
@@ -68,8 +68,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
68 68
69 step = _step_size_calculate(0, 9); 69 step = _step_size_calculate(0, 9);
70 efl_add(EFL_UI_SLIDER_CLASS, bx, 70 efl_add(EFL_UI_SLIDER_CLASS, bx,
71 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), 71 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)),
72 efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), 72 efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
73 efl_ui_range_step_set(efl_added, step), 73 efl_ui_range_step_set(efl_added, step),
74 efl_pack(bx, efl_added)); 74 efl_pack(bx, efl_added));
75 75
@@ -79,7 +79,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
79 efl_pack(bx, efl_added)); 79 efl_pack(bx, efl_added));
80 80
81 efl_add(EFL_UI_SLIDER_CLASS, bx, 81 efl_add(EFL_UI_SLIDER_CLASS, bx,
82 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), 82 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)),
83 efl_ui_range_min_max_set(efl_added, 10, 145), 83 efl_ui_range_min_max_set(efl_added, 10, 145),
84 efl_ui_range_step_set(efl_added, step), 84 efl_ui_range_step_set(efl_added, step),
85 elm_object_disabled_set(efl_added, EINA_TRUE), 85 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
95 efl_pack(bx, efl_added)); 95 efl_pack(bx, efl_added));
96 96
97 efl_add(EFL_UI_SLIDER_CLASS, hbx, 97 efl_add(EFL_UI_SLIDER_CLASS, hbx,
98 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), 98 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)),
99 efl_ui_range_min_max_set(efl_added, 10, 145), 99 efl_ui_range_min_max_set(efl_added, 10, 145),
100 efl_ui_range_step_set(efl_added, step), 100 efl_ui_range_step_set(efl_added, step),
101 efl_ui_range_value_set(efl_added, 70), 101 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
103 efl_pack(hbx, efl_added)); 103 efl_pack(hbx, efl_added));
104 104
105 efl_add(EFL_UI_SLIDER_CLASS, hbx, 105 efl_add(EFL_UI_SLIDER_CLASS, hbx,
106 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), 106 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)),
107 efl_ui_range_min_max_set(efl_added, 10, 145), 107 efl_ui_range_min_max_set(efl_added, 10, 145),
108 efl_ui_range_step_set(efl_added, step), 108 efl_ui_range_step_set(efl_added, step),
109 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 109 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
111 efl_pack(hbx, efl_added)); 111 efl_pack(hbx, efl_added));
112 112
113 efl_add(EFL_UI_SLIDER_CLASS, hbx, 113 efl_add(EFL_UI_SLIDER_CLASS, hbx,
114 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), 114 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)),
115 efl_ui_range_min_max_set(efl_added, 10, 145), 115 efl_ui_range_min_max_set(efl_added, 10, 145),
116 efl_ui_range_value_set(efl_added, 35), 116 efl_ui_range_value_set(efl_added, 35),
117 efl_ui_range_step_set(efl_added, step), 117 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
124 efl_pack(bx, efl_added)); 124 efl_pack(bx, efl_added));
125 125
126 efl_add(EFL_UI_SLIDER_CLASS, bx, 126 efl_add(EFL_UI_SLIDER_CLASS, bx,
127 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), 127 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)),
128 efl_ui_range_min_max_set(efl_added, 0, 150), 128 efl_ui_range_min_max_set(efl_added, 0, 150),
129 efl_ui_range_step_set(efl_added, step), 129 efl_ui_range_step_set(efl_added, step),
130 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_cb, NULL), 130 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
46 efl_pack(bx, efl_added)); 46 efl_pack(bx, efl_added));
47 47
48 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, 48 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
49 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), 49 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)),
50 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), 50 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
51 efl_pack(bx, efl_added)); 51 efl_pack(bx, efl_added));
52 52
@@ -57,7 +57,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
57 57
58 step = _step_size_calculate(0, 9); 58 step = _step_size_calculate(0, 9);
59 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, 59 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
60 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), 60 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)),
61 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), 61 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
62 efl_ui_range_step_set(efl_added, step), 62 efl_ui_range_step_set(efl_added, step),
63 efl_pack(bx, efl_added)); 63 efl_pack(bx, efl_added));
@@ -68,7 +68,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
68 efl_pack(bx, efl_added)); 68 efl_pack(bx, efl_added));
69 69
70 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, 70 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
71 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), 71 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)),
72 efl_ui_range_min_max_set(efl_added, 10, 145), 72 efl_ui_range_min_max_set(efl_added, 10, 145),
73 efl_ui_slider_interval_value_set(efl_added, 50, 100), 73 efl_ui_slider_interval_value_set(efl_added, 50, 100),
74 efl_ui_range_step_set(efl_added, step), 74 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
85 efl_pack(bx, efl_added)); 85 efl_pack(bx, efl_added));
86 86
87 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, 87 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
88 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), 88 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)),
89 efl_ui_range_min_max_set(efl_added, 10, 145), 89 efl_ui_range_min_max_set(efl_added, 10, 145),
90 efl_ui_slider_interval_value_set(efl_added, 50, 100), 90 efl_ui_slider_interval_value_set(efl_added, 50, 100),
91 efl_ui_range_step_set(efl_added, step), 91 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
93 efl_pack(hbx, efl_added)); 93 efl_pack(hbx, efl_added));
94 94
95 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, 95 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
96 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), 96 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)),
97 efl_ui_range_min_max_set(efl_added, 10, 145), 97 efl_ui_range_min_max_set(efl_added, 10, 145),
98 efl_ui_slider_interval_value_set(efl_added, 50, 100), 98 efl_ui_slider_interval_value_set(efl_added, 50, 100),
99 efl_ui_range_step_set(efl_added, step), 99 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
107 efl_pack(bx, efl_added)); 107 efl_pack(bx, efl_added));
108 108
109 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, 109 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
110 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), 110 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)),
111 efl_ui_range_min_max_set(efl_added, 0, 600), 111 efl_ui_range_min_max_set(efl_added, 0, 600),
112 efl_ui_slider_interval_value_set(efl_added, 100, 500), 112 efl_ui_slider_interval_value_set(efl_added, 100, 500),
113 efl_ui_range_step_set(efl_added, step), 113 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)
88 page = efl_add(EFL_UI_LAYOUT_CLASS, parent, 88 page = efl_add(EFL_UI_LAYOUT_CLASS, parent,
89 efl_file_set(efl_added, buf, "page_layout"), 89 efl_file_set(efl_added, buf, "page_layout"),
90 efl_text_set(efl_part(efl_added, "text"), text), 90 efl_text_set(efl_part(efl_added, "text"), text),
91 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 91 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
92 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE)); 92 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE));
93 93
94 return page; 94 return page;
95} 95}
@@ -133,20 +133,20 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
133 efl_content_set(win, efl_added)); 133 efl_content_set(win, efl_added));
134 134
135 navi = elm_naviframe_add(layout); 135 navi = elm_naviframe_add(layout);
136 efl_gfx_size_hint_weight_set(navi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 136 efl_gfx_hint_weight_set(navi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
137 efl_gfx_size_hint_align_set(navi, EVAS_HINT_FILL, EVAS_HINT_FILL); 137 efl_gfx_hint_align_set(navi, EVAS_HINT_FILL, EVAS_HINT_FILL);
138 efl_content_set(efl_part(layout, "menu"), navi); 138 efl_content_set(efl_part(layout, "menu"), navi);
139 139
140 list = elm_list_add(navi); 140 list = elm_list_add(navi);
141 efl_gfx_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 141 efl_gfx_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
142 efl_gfx_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); 142 efl_gfx_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
143 elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS); 143 elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS);
144 elm_naviframe_item_push(navi, "Properties", NULL, NULL, list, NULL); 144 elm_naviframe_item_push(navi, "Properties", NULL, NULL, list, NULL);
145 efl_gfx_entity_visible_set(list, EINA_TRUE); 145 efl_gfx_entity_visible_set(list, EINA_TRUE);
146 146
147 tp = efl_add(EFL_UI_TAB_PAGER_CLASS, layout, 147 tp = efl_add(EFL_UI_TAB_PAGER_CLASS, layout,
148 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 148 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
149 efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 149 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
150 efl_ui_pager_page_size_set(efl_added, EINA_SIZE2D(-1, -1)), 150 efl_ui_pager_page_size_set(efl_added, EINA_SIZE2D(-1, -1)),
151 efl_ui_pager_padding_set(efl_added, 20), 151 efl_ui_pager_padding_set(efl_added, 20),
152 efl_content_set(efl_part(layout, "tab_pager"), efl_added)); 152 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)
33 switch (mode) 33 switch (mode)
34 { 34 {
35 case NONE: 35 case NONE:
36 efl_gfx_size_hint_align_set(table, 0.5, 0.5); 36 efl_gfx_hint_align_set(table, 0.5, 0.5);
37 for (int i = 0; i < 7; i++) 37 for (int i = 0; i < 7; i++)
38 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 38 efl_gfx_hint_weight_set(objects[i], 0, 0);
39 break; 39 break;
40 case NONE_BUT_FILL: 40 case NONE_BUT_FILL:
41 efl_gfx_size_hint_fill_set(table, EINA_TRUE, EINA_TRUE); 41 efl_gfx_hint_fill_set(table, EINA_TRUE, EINA_TRUE);
42 for (int i = 0; i < 7; i++) 42 for (int i = 0; i < 7; i++)
43 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 43 efl_gfx_hint_weight_set(objects[i], 0, 0);
44 break; 44 break;
45 case EQUAL: 45 case EQUAL:
46 efl_gfx_size_hint_align_set(table, 0.5, 0.5); 46 efl_gfx_hint_align_set(table, 0.5, 0.5);
47 for (int i = 0; i < 7; i++) 47 for (int i = 0; i < 7; i++)
48 efl_gfx_size_hint_weight_set(objects[i], 1, 1); 48 efl_gfx_hint_weight_set(objects[i], 1, 1);
49 break; 49 break;
50 case ONE: 50 case ONE:
51 efl_gfx_size_hint_align_set(table, 0.5, 0.5); 51 efl_gfx_hint_align_set(table, 0.5, 0.5);
52 for (int i = 0; i < 6; i++) 52 for (int i = 0; i < 6; i++)
53 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 53 efl_gfx_hint_weight_set(objects[i], 0, 0);
54 efl_gfx_size_hint_weight_set(objects[6], 1, 1); 54 efl_gfx_hint_weight_set(objects[6], 1, 1);
55 break; 55 break;
56 case TWO: 56 case TWO:
57 efl_gfx_size_hint_align_set(table, 0.5, 0.5); 57 efl_gfx_hint_align_set(table, 0.5, 0.5);
58 for (int i = 0; i < 5; i++) 58 for (int i = 0; i < 5; i++)
59 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 59 efl_gfx_hint_weight_set(objects[i], 0, 0);
60 efl_gfx_size_hint_weight_set(objects[5], 1, 1); 60 efl_gfx_hint_weight_set(objects[5], 1, 1);
61 efl_gfx_size_hint_weight_set(objects[6], 1, 1); 61 efl_gfx_hint_weight_set(objects[6], 1, 1);
62 break; 62 break;
63 case CUSTOM: 63 case CUSTOM:
64 efl_object_override(table, &custom_layout_ops); 64 efl_object_override(table, &custom_layout_ops);
@@ -71,7 +71,7 @@ user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event)