summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/benchmarks/eina/eina_bench.h2
-rw-r--r--src/benchmarks/eina/eina_bench_crc_hash.c1
-rw-r--r--src/benchmarks/elementary/meson.build3
-rw-r--r--src/bin/edje/edje_cc_handlers.c137
-rw-r--r--src/bin/edje/edje_cc_out.c51
-rw-r--r--src/bin/edje/edje_player.c174
-rw-r--r--src/bin/efreet/efreetd_ipc.c21
-rw-r--r--src/bin/elementary/meson.build18
-rw-r--r--src/bin/elementary/perf_test_01.c4
-rw-r--r--src/bin/elementary/perf_test_02.c4
-rw-r--r--src/bin/elementary/perf_test_03.c4
-rw-r--r--src/bin/elementary/perf_test_04.c4
-rw-r--r--src/bin/elementary/perf_test_05.c4
-rw-r--r--src/bin/elementary/perf_test_06.c4
-rw-r--r--src/bin/elementary/test.c21
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_calendar.c2
-rw-r--r--src/bin/elementary/test_canvas_textblock.c64
-rw-r--r--src/bin/elementary/test_check.c63
-rw-r--r--src/bin/elementary/test_efl_anim_alpha.c4
-rw-r--r--src/bin/elementary/test_efl_anim_group_parallel.c8
-rw-r--r--src/bin/elementary/test_efl_anim_group_sequential.c8
-rw-r--r--src/bin/elementary/test_efl_anim_interpolator.c2
-rw-r--r--src/bin/elementary/test_efl_anim_pause.c4
-rw-r--r--src/bin/elementary/test_efl_anim_repeat.c4
-rw-r--r--src/bin/elementary/test_efl_anim_rotate.c12
-rw-r--r--src/bin/elementary/test_efl_anim_scale.c12
-rw-r--r--src/bin/elementary/test_efl_anim_start_delay.c4
-rw-r--r--src/bin/elementary/test_efl_anim_translate.c8
-rw-r--r--src/bin/elementary/test_efl_gfx_mapping.c2
-rw-r--r--src/bin/elementary/test_efl_gfx_vg_value_provider.c320
-rw-r--r--src/bin/elementary/test_efl_ui_text.c30
-rw-r--r--src/bin/elementary/test_efl_ui_vg_animation.c (renamed from src/bin/elementary/test_efl_ui_animation_view.c)152
-rw-r--r--src/bin/elementary/test_evas_map.c2
-rw-r--r--src/bin/elementary/test_evas_mask.c2
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_gesture_framework.c92
-rw-r--r--src/bin/elementary/test_gfx_filters.c19
-rw-r--r--src/bin/elementary/test_label.c256
-rw-r--r--src/bin/elementary/test_part_bg.c8
-rw-r--r--src/bin/elementary/test_part_shadow.c26
-rw-r--r--src/bin/elementary/test_photocam.c8
-rw-r--r--src/bin/elementary/test_radio.c44
-rw-r--r--src/bin/elementary/test_ui_box_stack.c2
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_clock.c98
-rw-r--r--src/bin/elementary/test_ui_collection.c7
-rw-r--r--src/bin/elementary/test_ui_frame.c8
-rw-r--r--src/bin/elementary/test_ui_image.c12
-rw-r--r--src/bin/elementary/test_ui_items.c5
-rw-r--r--src/bin/elementary/test_ui_pager.c2
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c2
-rw-r--r--src/bin/elementary/test_ui_panel.c4
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c16
-rw-r--r--src/bin/elementary/test_ui_progressbar.c4
-rw-r--r--src/bin/elementary/test_ui_relative_container.c12
-rw-r--r--src/bin/elementary/test_ui_scroller.c6
-rw-r--r--src/bin/elementary/test_ui_separator.c26
-rw-r--r--src/bin/elementary/test_ui_slider.c16
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c14
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c6
-rw-r--r--src/bin/elementary/test_ui_spotlight.c2
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c24
-rw-r--r--src/bin/elementary/test_ui_table_static.c2
-rw-r--r--src/bin/elementary/test_ui_timepicker.c6
-rw-r--r--src/bin/elementary/test_win_dialog.c10
-rw-r--r--src/bin/elementary/test_win_indicator.c2
-rw-r--r--src/bin/elementary/test_win_stack.c12
-rw-r--r--src/bin/eolian/docs.c2
-rw-r--r--src/bin/eolian/headers.c4
-rw-r--r--src/bin/eolian/main.c2
-rw-r--r--src/bin/eolian/types.c16
-rw-r--r--src/bin/eolian_mono/eolian/mono/async_function_definition.hh34
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh7
-rw-r--r--src/bin/eolian_mono/eolian/mono/documentation.hh240
-rw-r--r--src/bin/eolian_mono/eolian/mono/enum_definition.hh14
-rw-r--r--src/bin/eolian_mono/eolian/mono/events.hh209
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_declaration.hh4
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_definition.hh57
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_helpers.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/klass.hh290
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_annotation.hh139
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh9
-rw-r--r--src/bin/eolian_mono/eolian/mono/name_helpers.hh55
-rw-r--r--src/bin/eolian_mono/eolian/mono/parameter.hh305
-rw-r--r--src/bin/eolian_mono/eolian/mono/part_definition.hh24
-rw-r--r--src/bin/eolian_mono/eolian/mono/struct_definition.hh327
-rw-r--r--src/bin/eolian_mono/eolian/mono/struct_fields.hh160
-rw-r--r--src/bin/eolian_mono/eolian/mono/type_impl.hh28
-rw-r--r--src/bin/eolian_mono/eolian/mono/type_match.hh46
-rw-r--r--src/bin/eolian_mono/eolian/mono/utils.hh22
-rw-r--r--src/bin/eolian_mono/eolian/mono/variable_definition.hh6
-rw-r--r--src/bin/eolian_mono/eolian_mono.cc3
-rw-r--r--src/bin/exactness/.gitignore5
-rw-r--r--src/bin/exactness/exactness.c671
-rw-r--r--src/bin/exactness/injector.c467
-rw-r--r--src/bin/exactness/inspect.c1643
-rw-r--r--src/bin/exactness/meson.build42
-rw-r--r--src/bin/exactness/player.c1358
-rw-r--r--src/bin/exactness/player_entry.edc932
-rw-r--r--src/bin/exactness/recorder.c521
-rw-r--r--src/bindings/mono/ca.ruleset.in334
-rw-r--r--src/bindings/mono/efl_mono.dll.config.in3
-rw-r--r--src/bindings/mono/efl_mono/GenericModel.cs26
-rw-r--r--src/bindings/mono/efl_mono/efl_csharp_application.cs16
-rw-r--r--src/bindings/mono/efl_mono/meson.build1
-rw-r--r--src/bindings/mono/efl_sharp.csproj.in14
-rw-r--r--src/bindings/mono/eina_mono/eina_accessor.cs34
-rw-r--r--src/bindings/mono/eina_mono/eina_array.cs317
-rw-r--r--src/bindings/mono/eina_mono/eina_binbuf.cs4
-rw-r--r--src/bindings/mono/eina_mono/eina_container_common.cs60
-rw-r--r--src/bindings/mono/eina_mono/eina_environment.cs6
-rw-r--r--src/bindings/mono/eina_mono/eina_error.cs5
-rw-r--r--src/bindings/mono/eina_mono/eina_hash.cs9
-rw-r--r--src/bindings/mono/eina_mono/eina_inarray.cs7
-rw-r--r--src/bindings/mono/eina_mono/eina_inlist.cs7
-rw-r--r--src/bindings/mono/eina_mono/eina_iterator.cs7
-rw-r--r--src/bindings/mono/eina_mono/eina_list.cs371
-rw-r--r--src/bindings/mono/eina_mono/eina_promises.cs4
-rw-r--r--src/bindings/mono/eina_mono/eina_slice.cs13
-rw-r--r--src/bindings/mono/eina_mono/eina_stringshare.cs2
-rw-r--r--src/bindings/mono/eina_mono/eina_value.cs174
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_common.cs29
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_connection.cs12
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_message.cs2
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_object.cs12
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_proxy.cs8
-rw-r--r--src/bindings/mono/eo_mono/EoWrapper.cs29
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs251
-rw-r--r--src/bindings/mono/eo_mono/workaround.cs270
-rw-r--r--src/bindings/mono/meson.build75
-rw-r--r--src/examples/ecore/efl_net_control_example.c4
-rw-r--r--src/examples/elementary/.gitignore1
-rw-r--r--src/examples/elementary/bg_example_01.js2
-rw-r--r--src/examples/elementary/button_example_01.js6
-rw-r--r--src/examples/elementary/efl_canvas_layout_text.c2
-rw-r--r--src/examples/elementary/efl_canvas_textblock_obstacles_example.c273
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c13
-rw-r--r--src/examples/elementary/efl_ui_slideshow_example.c4
-rw-r--r--src/examples/elementary/efl_ui_unit_converter.cs11
-rw-r--r--src/examples/elementary/icon_example_01.js2
-rw-r--r--src/examples/elementary/location_example_01.c151
-rw-r--r--src/examples/elementary/meson.build4
-rw-r--r--src/examples/elementary/slider_example.js4
-rw-r--r--src/examples/elementary/table_cxx_example_01.cc8
-rw-r--r--src/examples/elementary/twitter_example_01.js12
-rw-r--r--src/examples/elocation/.gitignore1
-rw-r--r--src/examples/elocation/elocation.c167
-rw-r--r--src/examples/evas/efl-canvas-animation.c10
-rw-r--r--src/examples/evas/efl-canvas-vg-simple.c663
-rw-r--r--src/examples/evas/meson.build1
-rw-r--r--src/lib/ecore/Ecore_Common.h4
-rw-r--r--src/lib/ecore/ecore_exe_posix.c21
-rw-r--r--src/lib/ecore/ecore_internal.h33
-rw-r--r--src/lib/ecore/efl_accelerate_interpolator.eo4
-rw-r--r--src/lib/ecore/efl_boolean_model.c6
-rw-r--r--src/lib/ecore/efl_bounce_interpolator.eo4
-rw-r--r--src/lib/ecore/efl_cubic_bezier_interpolator.eo4
-rw-r--r--src/lib/ecore/efl_decelerate_interpolator.eo4
-rw-r--r--src/lib/ecore/efl_exe.c12
-rw-r--r--src/lib/ecore/efl_filter_model.c59
-rw-r--r--src/lib/ecore/efl_linear_interpolator.eo4
-rw-r--r--src/lib/ecore/efl_loop_model.c36
-rw-r--r--src/lib/ecore/efl_loop_model.eo1
-rw-r--r--src/lib/ecore/efl_sinusoidal_interpolator.eo4
-rw-r--r--src/lib/ecore/efl_spring_interpolator.eo4
-rw-r--r--src/lib/ecore_con/Ecore_Con.h6
-rw-r--r--src/lib/ecore_con/efl_net_control-connman.c9
-rw-r--r--src/lib/ecore_con/efl_net_control_manager.eo2
-rw-r--r--src/lib/ecore_con/efl_net_server_unix.c105
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.c2
-rw-r--r--src/lib/ecore_imf/Ecore_IMF.h24
-rw-r--r--src/lib/ecore_wl2/Ecore_Wl2.h535
-rw-r--r--src/lib/ecore_wl2/ecore_wl2.c2
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_input.c51
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_internal.h467
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h1
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c30
-rw-r--r--src/lib/ecore_x/Ecore_X.h15
-rw-r--r--src/lib/ecore_x/ecore_x.c28
-rw-r--r--src/lib/ecore_x/ecore_x_events.c182
-rw-r--r--src/lib/ecore_x/ecore_x_fixes.c99
-rw-r--r--src/lib/ecore_x/ecore_x_gesture.c108
-rw-r--r--src/lib/ecore_x/ecore_x_private.h13
-rw-r--r--src/lib/ecore_x/ecore_x_vsync.c2
-rw-r--r--src/lib/ecore_x/ecore_x_xi2.c5
-rw-r--r--src/lib/ecore_x/meson.build8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c20
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c17
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c55
-rw-r--r--src/lib/ector/software/ector_software_buffer.c2
-rw-r--r--src/lib/ector/software/ector_software_gradient.c22
-rw-r--r--src/lib/ector/software/ector_software_gradient.h4
-rw-r--r--src/lib/ector/software/ector_software_private.h2
-rw-r--r--src/lib/edje/Edje_Common.h8
-rw-r--r--src/lib/edje/Edje_Legacy.h38
-rw-r--r--src/lib/edje/edje_cache.c11
-rw-r--r--src/lib/edje/edje_calc.c179
-rw-r--r--src/lib/edje/edje_data.c7
-rw-r--r--src/lib/edje/edje_entry.c44
-rw-r--r--src/lib/edje/edje_legacy.c47
-rw-r--r--src/lib/edje/edje_load.c24
-rw-r--r--src/lib/edje/edje_lua.c20
-rw-r--r--src/lib/edje/edje_match.c10
-rw-r--r--src/lib/edje/edje_multisense.c2
-rw-r--r--src/lib/edje/edje_part_text.c108
-rw-r--r--src/lib/edje/edje_private.h45
-rw-r--r--src/lib/edje/edje_program.c83
-rw-r--r--src/lib/edje/edje_smart.c7
-rw-r--r--src/lib/edje/edje_textblock.c135
-rw-r--r--src/lib/edje/edje_textblock_styles.c160
-rw-r--r--src/lib/edje/edje_util.c176
-rw-r--r--src/lib/edje/efl_canvas_layout_part_text.eo42
-rw-r--r--src/lib/eet/Eet.h23
-rw-r--r--src/lib/eeze/eeze_sensor.c1
-rw-r--r--src/lib/efl/Efl.h98
-rw-r--r--src/lib/efl/interfaces/efl_config.eo3
-rw-r--r--src/lib/efl/interfaces/efl_gfx_arrangement.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_path.c3
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot22
-rw-r--r--src/lib/efl/interfaces/efl_input_text.eo262
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c4
-rw-r--r--src/lib/efl/interfaces/efl_interpolator.eo4
-rw-r--r--src/lib/efl/interfaces/efl_model.eo19
-rw-r--r--src/lib/efl/interfaces/efl_player.eo53
-rw-r--r--src/lib/efl/interfaces/efl_text_font.eo172
-rw-r--r--src/lib/efl/interfaces/efl_text_font_properties.eo182
-rw-r--r--src/lib/efl/interfaces/efl_text_format.eo119
-rw-r--r--src/lib/efl/interfaces/efl_text_markup.eo3
-rw-r--r--src/lib/efl/interfaces/efl_text_style.eo295
-rw-r--r--src/lib/efl/interfaces/efl_text_types.eot17
-rw-r--r--src/lib/efl/interfaces/efl_types.eot4
-rw-r--r--src/lib/efl/interfaces/efl_ui_range_display.eo2
-rw-r--r--src/lib/efl/interfaces/efl_ui_scrollbar.eo12
-rw-r--r--src/lib/efl/interfaces/efl_ui_text_selectable.eo13
-rw-r--r--src/lib/efl/interfaces/meson.build4
-rw-r--r--src/lib/efl_mono/efl_custom_exports_mono.c36
-rw-r--r--src/lib/efl_mono/efl_mono_accessors.c93
-rw-r--r--src/lib/efl_wl/efl_wl.c1
-rw-r--r--src/lib/efreet/efreet_cache.c2
-rw-r--r--src/lib/eina/Eina.h1
-rw-r--r--src/lib/eina/eina_accessor.c38
-rw-r--r--src/lib/eina/eina_accessor.h36
-rw-r--r--src/lib/eina/eina_cow.h18
-rw-r--r--src/lib/eina/eina_file_common.c4
-rw-r--r--src/lib/eina/eina_hash.c3
-rw-r--r--src/lib/eina/eina_hash.h4
-rw-r--r--src/lib/eina/eina_inarray.c2
-rw-r--r--src/lib/eina/eina_inline_range.x82
-rw-r--r--src/lib/eina/eina_inline_str.x20
-rw-r--r--src/lib/eina/eina_inline_value.x11
-rw-r--r--src/lib/eina/eina_inlist.h8
-rw-r--r--src/lib/eina/eina_list.h40
-rw-r--r--src/lib/eina/eina_matrix.c206
-rw-r--r--src/lib/eina/eina_matrix.h64
-rw-r--r--src/lib/eina/eina_promise.c70
-rw-r--r--src/lib/eina/eina_promise.h32
-rw-r--r--src/lib/eina/eina_range.h116
-rw-r--r--src/lib/eina/eina_rbtree.c12
-rw-r--r--src/lib/eina/meson.build2
-rw-r--r--src/lib/eio/efl_io_manager.eo4
-rw-r--r--src/lib/eldbus/eldbus_service.c5
-rw-r--r--src/lib/elementary/Efl_Ui.h14
-rw-r--r--src/lib/elementary/Elementary.h6
-rw-r--r--src/lib/elementary/Elementary_Options.h.in4
-rw-r--r--src/lib/elementary/efl_datetime_manager.c8
-rw-r--r--src/lib/elementary/efl_text_interactive.eo70
-rw-r--r--src/lib/elementary/efl_ui.eot14
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.eo2
-rw-r--r--src/lib/elementary/efl_ui_alert_popup_part_title.eo7
-rw-r--r--src/lib/elementary/efl_ui_animation_view.c803
-rw-r--r--src/lib/elementary/efl_ui_animation_view.eo313
-rw-r--r--src/lib/elementary/efl_ui_animation_view_eo.legacy.c162
-rw-r--r--src/lib/elementary/efl_ui_animation_view_private.h42
-rw-r--r--src/lib/elementary/efl_ui_caching_factory.eo3
-rw-r--r--src/lib/elementary/efl_ui_clock.c6
-rw-r--r--src/lib/elementary/efl_ui_collection.c28
-rw-r--r--src/lib/elementary/efl_ui_collection.eo7
-rw-r--r--src/lib/elementary/efl_ui_collection_view.c281
-rw-r--r--src/lib/elementary/efl_ui_collection_view.eo6
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.c8
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.eo8
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c105
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.eo19
-rw-r--r--src/lib/elementary/efl_ui_format.c4
-rw-r--r--src/lib/elementary/efl_ui_image.c25
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c48
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo7
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c1407
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.eo28
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.c13
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.eo6
-rw-r--r--src/lib/elementary/efl_ui_item.c12
-rw-r--r--src/lib/elementary/efl_ui_item.eo6
-rw-r--r--src/lib/elementary/efl_ui_layout.c41
-rw-r--r--src/lib/elementary/efl_ui_layout_base.eo16
-rw-r--r--src/lib/elementary/efl_ui_layout_factory.eo4
-rw-r--r--src/lib/elementary/efl_ui_multi_selectable.eo5
-rw-r--r--src/lib/elementary/efl_ui_multi_selectable_index_range.eo17
-rw-r--r--src/lib/elementary/efl_ui_multi_selectable_object_range.eo5
-rw-r--r--src/lib/elementary/efl_ui_pager.c2
-rw-r--r--src/lib/elementary/efl_ui_pager.eo4
-rw-r--r--src/lib/elementary/efl_ui_pan.c4
-rw-r--r--src/lib/elementary/efl_ui_panel.c35
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_panes.eo4
-rw-r--r--src/lib/elementary/efl_ui_popup.c8
-rw-r--r--src/lib/elementary/efl_ui_popup.eo1
-rw-r--r--src/lib/elementary/efl_ui_position_manager_data_access_v1.eo1
-rw-r--r--src/lib/elementary/efl_ui_position_manager_entity.eo3
-rw-r--r--src/lib/elementary/efl_ui_position_manager_grid.c71
-rw-r--r--src/lib/elementary/efl_ui_position_manager_list.c57
-rw-r--r--src/lib/elementary/efl_ui_position_manager_list.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c198
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo53
-rw-r--r--src/lib/elementary/efl_ui_radio_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_group_impl.c12
-rw-r--r--src/lib/elementary/efl_ui_radio_group_impl.eo1
-rw-r--r--src/lib/elementary/efl_ui_relative_container.eo5
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c7
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.eo1
-rw-r--r--src/lib/elementary/efl_ui_scroll_util.c14
-rw-r--r--src/lib/elementary/efl_ui_scroller.c18
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo1
-rw-r--r--src/lib/elementary/efl_ui_select_model.c54
-rw-r--r--src/lib/elementary/efl_ui_selection_manager.c6
-rw-r--r--src/lib/elementary/efl_ui_separator.c46
-rw-r--r--src/lib/elementary/efl_ui_separator.eo20
-rw-r--r--src/lib/elementary/efl_ui_single_selectable.eo6
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c9
-rw-r--r--src/lib/elementary/efl_ui_spotlight_container.c10
-rw-r--r--src/lib/elementary/efl_ui_spotlight_container.eo24
-rw-r--r--src/lib/elementary/efl_ui_spotlight_fade_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_manager_stack.c)56
-rw-r--r--src/lib/elementary/efl_ui_spotlight_fade_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_manager_stack.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_icon_indicator.c (renamed from src/lib/elementary/efl_ui_spotlight_indicator_icon.c)20
-rw-r--r--src/lib/elementary/efl_ui_spotlight_icon_indicator.eo (renamed from src/lib/elementary/efl_ui_spotlight_indicator_icon.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_plain_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_manager_plain.c)57
-rw-r--r--src/lib/elementary/efl_ui_spotlight_plain_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_manager_plain.eo)4
-rw-r--r--src/lib/elementary/efl_ui_spotlight_scroll_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_manager_scroll.c)41
-rw-r--r--src/lib/elementary/efl_ui_spotlight_scroll_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_manager_scroll.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_util.c2
-rw-r--r--src/lib/elementary/efl_ui_stack.c2
-rw-r--r--src/lib/elementary/efl_ui_stack.eo3
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c13
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.eo1
-rw-r--r--src/lib/elementary/efl_ui_tab_bar_private.h1
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.c140
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.eo24
-rw-r--r--src/lib/elementary/efl_ui_tab_pager_private.h1
-rw-r--r--src/lib/elementary/efl_ui_tags.c8
-rw-r--r--src/lib/elementary/efl_ui_text.eo445
-rw-r--r--src/lib/elementary/efl_ui_text_async.eo9
-rw-r--r--src/lib/elementary/efl_ui_text_editable.eo8
-rw-r--r--src/lib/elementary/efl_ui_text_factory_emoticons.c2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_emoticons.eo4
-rw-r--r--src/lib/elementary/efl_ui_text_factory_fallback.c8
-rw-r--r--src/lib/elementary/efl_ui_text_factory_fallback.eo4
-rw-r--r--src/lib/elementary/efl_ui_text_factory_images.c2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_images.eo4
-rw-r--r--src/lib/elementary/efl_ui_text_part.eo8
-rw-r--r--src/lib/elementary/efl_ui_textbox.c (renamed from src/lib/elementary/efl_ui_text.c)2227
-rw-r--r--src/lib/elementary/efl_ui_textbox.eo135
-rw-r--r--src/lib/elementary/efl_ui_textbox_async.eo9
-rw-r--r--src/lib/elementary/efl_ui_textbox_part.eo8
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c62
-rw-r--r--src/lib/elementary/efl_ui_timepicker.eo1
-rw-r--r--src/lib/elementary/efl_ui_vg_animation.c936
-rw-r--r--src/lib/elementary/efl_ui_vg_animation.eo176
-rw-r--r--src/lib/elementary/efl_ui_vg_animation.h (renamed from src/lib/elementary/efl_ui_animation_view.h)2
-rw-r--r--src/lib/elementary/efl_ui_vg_animation_eo.legacy.c200
-rw-r--r--src/lib/elementary/efl_ui_vg_animation_eo.legacy.h (renamed from src/lib/elementary/efl_ui_animation_view_eo.legacy.h)10
-rw-r--r--src/lib/elementary/efl_ui_vg_animation_legacy.h (renamed from src/lib/elementary/efl_ui_animation_view_legacy.h)2
-rw-r--r--src/lib/elementary/efl_ui_vg_animation_private.h43
-rw-r--r--src/lib/elementary/efl_ui_widget.c36
-rw-r--r--src/lib/elementary/efl_ui_widget.eo4
-rw-r--r--src/lib/elementary/efl_ui_widget_factory.c14
-rw-r--r--src/lib/elementary/efl_ui_widget_scrollable_content.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c293
-rw-r--r--src/lib/elementary/elc_fileselector.c15
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c14
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c3
-rw-r--r--src/lib/elementary/elm_code_text.c3
-rw-r--r--src/lib/elementary/elm_code_widget.c18
-rw-r--r--src/lib/elementary/elm_config.c141
-rw-r--r--src/lib/elementary/elm_config.h98
-rw-r--r--src/lib/elementary/elm_dbus_menu.c1
-rw-r--r--src/lib/elementary/elm_deprecated.h19
-rw-r--r--src/lib/elementary/elm_entry.c26
-rw-r--r--src/lib/elementary/elm_index.c12
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c28
-rw-r--r--src/lib/elementary/elm_main.c22
-rw-r--r--src/lib/elementary/elm_need.h15
-rw-r--r--src/lib/elementary/elm_priv.h14
-rw-r--r--src/lib/elementary/elm_slider_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_transit.c6
-rw-r--r--src/lib/elementary/els_box.c2
-rw-r--r--src/lib/elementary/els_cursor.c2
-rw-r--r--src/lib/elementary/meson.build45
-rw-r--r--src/lib/elocation/Elocation.h433
-rw-r--r--src/lib/elocation/elocation.c1414
-rw-r--r--src/lib/elocation/elocation_private.h186
-rw-r--r--src/lib/elocation/gen/eldbus_geo_clue2_client.c448
-rw-r--r--src/lib/elocation/gen/eldbus_geo_clue2_client.h36
-rw-r--r--src/lib/elocation/gen/eldbus_geo_clue2_location.c246
-rw-r--r--src/lib/elocation/gen/eldbus_geo_clue2_location.h22
-rw-r--r--src/lib/elocation/gen/eldbus_geo_clue2_manager.c209
-rw-r--r--src/lib/elocation/gen/eldbus_geo_clue2_manager.h23
-rw-r--r--src/lib/elocation/gen/eldbus_utils.h24
-rw-r--r--src/lib/elocation/gen/meson.build5
-rw-r--r--src/lib/elocation/gen/org.freedesktop.GeoClue2.xml199
-rw-r--r--src/lib/elocation/meson.build28
-rw-r--r--src/lib/elua/meson.build13
-rw-r--r--src/lib/emotion/efl_canvas_video.eo2
-rw-r--r--src/lib/emotion/emotion_smart.c7
-rw-r--r--src/lib/eo/eina_types.eot56
-rw-r--r--src/lib/eo/eo_base_class.c138
-rw-r--r--src/lib/eo/eo_ptr_indirection.x7
-rw-r--r--src/lib/eolian/Eolian.h5
-rw-r--r--src/lib/eolian/database_type_api.c2
-rw-r--r--src/lib/eolian/database_validate.c8
-rw-r--r--src/lib/eolian/eo_parser.c24
-rw-r--r--src/lib/eolian_cxx/grammar/klass_def.hpp5
-rw-r--r--src/lib/eolian_cxx/grammar/type_impl.hpp9
-rw-r--r--src/lib/evas/Efl_Canvas.h26
-rw-r--r--src/lib/evas/Evas_Common.h133
-rw-r--r--src/lib/evas/Evas_Eo.h141
-rw-r--r--src/lib/evas/Evas_Internal.h12
-rw-r--r--src/lib/evas/cache/evas_cache.h2
-rw-r--r--src/lib/evas/cache/evas_cache_engine_image.c69
-rw-r--r--src/lib/evas/cache/evas_cache_image.c166
-rw-r--r--src/lib/evas/canvas/efl_canvas_alpha_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_alpha.c)22
-rw-r--r--src/lib/evas/canvas/efl_canvas_alpha_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_alpha.eo)6
-rw-r--r--src/lib/evas/canvas/efl_canvas_alpha_animation_private.h19
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.eo8
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_alpha_private.h19
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_private.h15
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate_private.h30
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale_private.h25
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate_private.h16
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_types.eot4
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_group.c)51
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_group.eo)8
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_animation_private.h16
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c21
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_object_animation.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_object_animation.eo39
-rw-r--r--src/lib/evas/canvas/efl_canvas_parallel_group_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_group_parallel.c)10
-rw-r--r--src/lib/evas/canvas/efl_canvas_parallel_group_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo)7
-rw-r--r--src/lib/evas/canvas/efl_canvas_parallel_group_animation_private.h (renamed from src/lib/evas/canvas/efl_canvas_animation_group_parallel_private.h)0
-rw-r--r--src/lib/evas/canvas/efl_canvas_rotate_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_rotate.c)30
-rw-r--r--src/lib/evas/canvas/efl_canvas_rotate_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_rotate.eo)8
-rw-r--r--src/lib/evas/canvas/efl_canvas_rotate_animation_private.h30
-rw-r--r--src/lib/evas/canvas/efl_canvas_scale_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_scale.c)30
-rw-r--r--src/lib/evas/canvas/efl_canvas_scale_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_scale.eo)12
-rw-r--r--src/lib/evas/canvas/efl_canvas_scale_animation_private.h25
-rw-r--r--src/lib/evas/canvas/efl_canvas_sequential_group_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_group_sequential.c)10
-rw-r--r--src/lib/evas/canvas/efl_canvas_sequential_group_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo)6
-rw-r--r--src/lib/evas/canvas/efl_canvas_sequential_group_animation_private.h (renamed from src/lib/evas/canvas/efl_canvas_animation_group_sequential_private.h)0
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo565
-rw-r--r--src/lib/evas/canvas/efl_canvas_text_eo.legacy.c72
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo499
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c72
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h (renamed from src/lib/evas/canvas/efl_canvas_text_eo.legacy.h)36
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_factory.eo (renamed from src/lib/evas/canvas/efl_canvas_text_factory.eo)2
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_internal.h (renamed from src/lib/evas/canvas/efl_canvas_text_internal.h)32
-rw-r--r--src/lib/evas/canvas/efl_canvas_translate_animation.c (renamed from src/lib/evas/canvas/efl_canvas_animation_translate.c)30
-rw-r--r--src/lib/evas/canvas/efl_canvas_translate_animation.eo (renamed from src/lib/evas/canvas/efl_canvas_animation_translate.eo)8
-rw-r--r--src/lib/evas/canvas/efl_canvas_translate_animation_private.h16
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_image.c1
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.c58
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c105
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h2
-rw-r--r--src/lib/evas/canvas/efl_gfx_mapping.c14
-rw-r--r--src/lib/evas/canvas/efl_gfx_vg_value_provider.c8
-rw-r--r--src/lib/evas/canvas/efl_gfx_vg_value_provider.eo2
-rw-r--r--src/lib/evas/canvas/efl_gfx_vg_value_provider.h2
-rw-r--r--src/lib/evas/canvas/efl_input_types.eot17
-rw-r--r--src/lib/evas/canvas/efl_text_cursor.c53
-rw-r--r--src/lib/evas/canvas/efl_text_cursor.eo87
-rw-r--r--src/lib/evas/canvas/efl_text_formatter.c (renamed from src/lib/evas/canvas/efl_text_attribute_factory.c)33
-rw-r--r--src/lib/evas/canvas/efl_text_formatter.eo (renamed from src/lib/evas/canvas/efl_text_attribute_factory.eo)18
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c7
-rw-r--r--src/lib/evas/canvas/evas_clip.c4
-rw-r--r--src/lib/evas/canvas/evas_device.c6
-rw-r--r--src/lib/evas/canvas/evas_events.c42
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c8
-rw-r--r--src/lib/evas/canvas/evas_image_private.h2
-rw-r--r--src/lib/evas/canvas/evas_main.c8
-rw-r--r--src/lib/evas/canvas/evas_object_box.c10
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c20
-rw-r--r--src/lib/evas/canvas/evas_object_image.c40
-rw-r--r--src/lib/evas/canvas/evas_object_main.c17
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c53
-rw-r--r--src/lib/evas/canvas/evas_object_text.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2604
-rw-r--r--src/lib/evas/canvas/evas_render.c27
-rw-r--r--src/lib/evas/canvas/evas_text_eo.c2
-rw-r--r--src/lib/evas/canvas/evas_text_eo.hh4
-rw-r--r--src/lib/evas/canvas/evas_textblock_hyphenation.x4
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy.h112
-rw-r--r--src/lib/evas/canvas/evas_textgrid_eo.c2
-rw-r--r--src/lib/evas/canvas/evas_textgrid_eo.hh4
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h2
-rw-r--r--src/lib/evas/canvas/meson.build38
-rw-r--r--src/lib/evas/common/evas_font.h53
-rw-r--r--src/lib/evas/common/evas_font_draw.c2
-rw-r--r--src/lib/evas/common/evas_font_load.c6
-rw-r--r--src/lib/evas/common/evas_font_main.c296
-rw-r--r--src/lib/evas/common/evas_font_query.c66
-rw-r--r--src/lib/evas/common/evas_image.h1
-rw-r--r--src/lib/evas/common/evas_image_main.c12
-rw-r--r--src/lib/evas/common/evas_map_image.c8
-rw-r--r--src/lib/evas/common/evas_map_image_internal_high.c2
-rw-r--r--src/lib/evas/common/evas_text_utils.c6
-rw-r--r--src/lib/evas/filters/evas_filter.c2
-rw-r--r--src/lib/evas/filters/meson.build30
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.c17
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.eo19
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_custom.c38
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_custom.eo33
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_events.eo (renamed from src/lib/evas/gesture/efl_gesture_events.eo)22
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_flick.c4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_flick.eo24
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c566
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.eo25
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_momentum.c2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_momentum.eo14
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h78
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer.c40
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo37
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_custom.c37
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_custom.eo28
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c185
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.eo14
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c274
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c183
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo15
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c277
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c112
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c184
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.eo14
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c228
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_tap.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_touch.c116
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_touch.eo35
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_types.eot57
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_zoom.c4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_zoom.eo24
-rw-r--r--src/lib/evas/gesture/meson.build6
-rw-r--r--src/lib/evas/include/evas_private.h7
-rw-r--r--src/lib/evas/meson.build2
-rw-r--r--src/lib/evas/vg/evas_vg_cache.c51
-rw-r--r--src/lib/exactness/Exactness.h268
-rw-r--r--src/lib/exactness/exactness_private.h10
-rw-r--r--src/lib/exactness/legacy_file.c875
-rw-r--r--src/lib/exactness/meson.build31
-rw-r--r--src/lib/exactness/unit.c409
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h5
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c58
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c20
-rw-r--r--src/modules/ecore_imf/meson.build5
-rw-r--r--src/modules/eeze/meson.build1
-rw-r--r--src/modules/eeze/sensor/tizen/meson.build8
-rw-r--r--src/modules/eeze/sensor/tizen/tizen.c1383
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h1
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c3
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c31
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c4
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c23
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c4
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c8
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c49
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c2
-rw-r--r--src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c2
-rw-r--r--src/modules/evas/model_loaders/ply/evas_model_load_ply.c6
-rwxr-xr-xsrc/scripts/eina/eina-bench-cmp250
-rw-r--r--src/scripts/eina/meson.build4
-rw-r--r--src/scripts/meson.build1
-rw-r--r--src/static_libs/lz4/lz4.c445
-rw-r--r--src/static_libs/lz4/lz4.h142
-rw-r--r--src/static_libs/lz4/lz4frame.c28
-rw-r--r--src/static_libs/lz4/lz4frame.h9
-rw-r--r--src/static_libs/lz4/lz4hc.c122
-rw-r--r--src/static_libs/lz4/lz4hc.h3
-rw-r--r--src/static_libs/vg_common/vg_common_json.c61
-rw-r--r--src/tests/ecore/efl_app_test_promise.c29
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_suite.c7
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_suite.h13
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_display.c138
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_ecore_wl2.c22
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_input.c196
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_output.c33
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_window.c675
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h42
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_tests_helpers.h44
-rw-r--r--src/tests/ecore_wl2/meson.build14
-rw-r--r--src/tests/edje/data/test_textblock.edc41
-rw-r--r--src/tests/edje/edje_test_text.c67
-rw-r--r--src/tests/efl/efl_test_composite_model.c27
-rw-r--r--src/tests/efl_check.h10
-rw-r--r--src/tests/efl_js/benchmark_object.eo5
-rw-r--r--src/tests/efl_mono/Array.cs189
-rw-r--r--src/tests/efl_mono/Eina.cs361
-rw-r--r--src/tests/efl_mono/EinaTestData.cs4
-rw-r--r--src/tests/efl_mono/Eo.cs102
-rw-r--r--src/tests/efl_mono/Events.cs35
-rw-r--r--src/tests/efl_mono/List.cs193
-rw-r--r--src/tests/efl_mono/Model.cs3
-rw-r--r--src/tests/efl_mono/Parts.cs1
-rw-r--r--src/tests/efl_mono/StructHelpers.cs129
-rw-r--r--src/tests/efl_mono/Structs.cs65
-rw-r--r--src/tests/efl_mono/Value.cs504
-rw-r--r--src/tests/efl_mono/dummy_child.eo4
-rw-r--r--src/tests/efl_mono/dummy_hidden_object.eo1
-rw-r--r--src/tests/efl_mono/dummy_inherit_helper.eo4
-rw-r--r--src/tests/efl_mono/dummy_inherit_iface.eo1
-rw-r--r--src/tests/efl_mono/dummy_numberwrapper.eo1
-rw-r--r--src/tests/efl_mono/dummy_part_holder.eo1
-rw-r--r--src/tests/efl_mono/dummy_test_object.c55
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo112
-rw-r--r--src/tests/efl_mono/efl_sharp_test_suite.csproj.in3
-rw-r--r--src/tests/efl_mono/meson.build5
-rw-r--r--src/tests/eina/eina_suite.c1
-rw-r--r--src/tests/eina/eina_suite.h1
-rw-r--r--src/tests/eina/eina_test_accessor.c32
-rw-r--r--src/tests/eina/eina_test_file.c33
-rw-r--r--src/tests/eina/eina_test_inarray.c2
-rw-r--r--src/tests/eina/eina_test_matrix.c123
-rw-r--r--src/tests/eina/eina_test_range.c72
-rw-r--r--src/tests/eina/eina_test_safepointer.c2
-rw-r--r--src/tests/eina/eina_test_value.c43
-rw-r--r--src/tests/eina/eina_test_vpath.c24
-rw-r--r--src/tests/eina/meson.build1
-rw-r--r--src/tests/eina_cxx/eina_simple.eo4
-rw-r--r--src/tests/eio/eio_test_map.c10
-rw-r--r--src/tests/elementary/custom_recognizer.c38
-rw-r--r--src/tests/elementary/custom_recognizer.eo10
-rw-r--r--src/tests/elementary/custom_recognizer2.c41
-rw-r--r--src/tests/elementary/custom_recognizer2.eo10
-rw-r--r--src/tests/elementary/efl_ui_suite.c8
-rw-r--r--src/tests/elementary/efl_ui_suite.h4
-rw-r--r--src/tests/elementary/efl_ui_test_collection_view.c160
-rw-r--r--src/tests/elementary/efl_ui_test_focus.c18
-rw-r--r--src/tests/elementary/efl_ui_test_focus_common.h2
-rw-r--r--src/tests/elementary/efl_ui_test_gesture.c609
-rw-r--r--src/tests/elementary/efl_ui_test_grid.c7
-rw-r--r--src/tests/elementary/efl_ui_test_layout.c16
-rw-r--r--src/tests/elementary/efl_ui_test_list_collection.c4
-rw-r--r--src/tests/elementary/efl_ui_test_position_manager_common.c1
-rw-r--r--src/tests/elementary/efl_ui_test_scroller.c51
-rw-r--r--src/tests/elementary/efl_ui_test_select_model.c9
-rw-r--r--src/tests/elementary/efl_ui_test_spin_button.c56
-rw-r--r--src/tests/elementary/efl_ui_test_spotlight.c8
-rw-r--r--src/tests/elementary/efl_ui_test_text.c266
-rw-r--r--src/tests/elementary/efl_ui_test_timepicker.c45
-rw-r--r--src/tests/elementary/efl_ui_test_vg_animation.c122
-rw-r--r--src/tests/elementary/elm_test_entry.c73
-rw-r--r--src/tests/elementary/emoji_wink.json1
-rw-r--r--src/tests/elementary/meson.build8
-rw-r--r--src/tests/elementary/spec/efl_test_basics.c27
-rw-r--r--src/tests/elementary/spec/efl_test_clickable.c6
-rw-r--r--src/tests/elementary/spec/efl_test_content.c10
-rw-r--r--src/tests/elementary/spec/efl_test_format.c4
-rw-r--r--src/tests/elementary/spec/efl_test_gfx_view.c2
-rw-r--r--src/tests/elementary/spec/efl_test_range_display.c4
-rw-r--r--src/tests/elementary/spec/efl_ui_spec_suite.c4
-rw-r--r--src/tests/elementary/suite_helpers.c199
-rw-r--r--src/tests/elementary/suite_helpers.h14
-rw-r--r--src/tests/elocation/elocation_suite.c235
-rw-r--r--src/tests/eo/suite/eo_test_event.c35
-rw-r--r--src/tests/eolian/data/base.eo1
-rw-r--r--src/tests/eolian/data/class_funcs.eo1
-rw-r--r--src/tests/eolian/data/class_requires.eo1
-rw-r--r--src/tests/eolian/data/class_simple.eo4
-rw-r--r--src/tests/eolian/data/class_simple_ref_eo.h10
-rw-r--r--src/tests/eolian/data/complex_type.eo4
-rw-r--r--src/tests/eolian/data/consts.eo1
-rw-r--r--src/tests/eolian/data/ctor_dtor.eo1
-rw-r--r--src/tests/eolian/data/docs_ref.h36
-rw-r--r--src/tests/eolian/data/enum.eo9
-rw-r--r--src/tests/eolian/data/eo_docs.eo14
-rw-r--r--src/tests/eolian/data/error.eo2
-rw-r--r--src/tests/eolian/data/events.eo1
-rw-r--r--src/tests/eolian/data/extern.eo13
-rw-r--r--src/tests/eolian/data/free_func.eo7
-rw-r--r--src/tests/eolian/data/function_as_argument.eo1
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.h6
-rw-r--r--src/tests/eolian/data/iface.eo1
-rw-r--r--src/tests/eolian/data/import.eo3
-rw-r--r--src/tests/eolian/data/mixins_require.eo1
-rw-r--r--src/tests/eolian/data/nmsp1_class1.eo4
-rw-r--r--src/tests/eolian/data/nmsp1_nmsp11_class2.eo4
-rw-r--r--src/tests/eolian/data/nmsp2_class1.eo4
-rw-r--r--src/tests/eolian/data/no_nmsp.eo4
-rw-r--r--src/tests/eolian/data/object_impl.eo15
-rw-r--r--src/tests/eolian/data/object_impl_add.eo2
-rw-r--r--src/tests/eolian/data/object_impl_add_ref.c2
-rw-r--r--src/tests/eolian/data/object_impl_ref.c2
-rw-r--r--src/tests/eolian/data/override.eo1
-rw-r--r--src/tests/eolian/data/scope.eo1
-rw-r--r--src/tests/eolian/data/struct.eo6
-rw-r--r--src/tests/eolian/data/struct_ref.h26
-rw-r--r--src/tests/eolian/data/struct_ref_stub.h18
-rw-r--r--src/tests/eolian/data/typedef.eo15
-rw-r--r--src/tests/eolian/data/typedef_ref.h38
-rw-r--r--src/tests/eolian/data/typedef_ref_stub.h26
-rw-r--r--src/tests/eolian/data/unimpl.eo1
-rw-r--r--src/tests/eolian/data/var.eo3
-rw-r--r--src/tests/eolian/data_aux/aux_a.eo1
-rw-r--r--src/tests/eolian/data_aux/aux_b.eo1
-rw-r--r--src/tests/eolian/data_aux/aux_c.eo1
-rw-r--r--src/tests/eolian/eolian_generation.c1
-rw-r--r--src/tests/eolian/eolian_parsing.c9
-rw-r--r--src/tests/eolian/generated_future.eo4
-rw-r--r--src/tests/eolian_cxx/a.eo4
-rw-r--r--src/tests/eolian_cxx/b.eo4
-rw-r--r--src/tests/eolian_cxx/c.eo4
-rw-r--r--src/tests/eolian_cxx/callback.eo8
-rw-r--r--src/tests/eolian_cxx/complex.eo56
-rw-r--r--src/tests/eolian_cxx/cyclic1.eo4
-rw-r--r--src/tests/eolian_cxx/cyclic2.eo4
-rw-r--r--src/tests/eolian_cxx/docs.eo15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_binding.cc13
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_documentation.cc30
-rw-r--r--src/tests/eolian_cxx/generic.c13
-rw-r--r--src/tests/eolian_cxx/generic.eo39
-rw-r--r--src/tests/eolian_cxx/generic_interface.eo4
-rw-r--r--src/tests/eolian_cxx/name_name.eo1
-rw-r--r--src/tests/eolian_cxx/ns_name.eo1
-rw-r--r--src/tests/eolian_cxx/ns_name_other.eo1
-rw-r--r--src/tests/eolian_cxx/property_holder.eo4
-rw-r--r--src/tests/eolian_cxx/simple.eo4
-rw-r--r--src/tests/eolian_js/constructor_method_class.eo4
-rw-r--r--src/tests/eolian_js/test_object.eo3
-rw-r--r--src/tests/evas/efl_canvas_animation.c42
-rw-r--r--src/tests/evas/evas_buffer_helper.c199
-rw-r--r--src/tests/evas/evas_buffer_helper.h32
-rw-r--r--src/tests/evas/evas_test_image.c86
-rw-r--r--src/tests/evas/evas_test_object_smart.c2
-rw-r--r--src/tests/evas/evas_test_textblock.c534
-rw-r--r--src/tests/evas/meson.build1
758 files changed, 33535 insertions, 18562 deletions
diff --git a/src/benchmarks/eina/eina_bench.h b/src/benchmarks/eina/eina_bench.h
index a38d704..747ac6f 100644
--- a/src/benchmarks/eina/eina_bench.h
+++ b/src/benchmarks/eina/eina_bench.h
@@ -21,7 +21,7 @@
21 21
22#include "eina_benchmark.h" 22#include "eina_benchmark.h"
23 23
24int key_size; 24extern int key_size;
25 25
26void eina_bench_hash(Eina_Benchmark *bench); 26void eina_bench_hash(Eina_Benchmark *bench);
27void eina_bench_crc_hash_short(Eina_Benchmark *bench); 27void eina_bench_crc_hash_short(Eina_Benchmark *bench);
diff --git a/src/benchmarks/eina/eina_bench_crc_hash.c b/src/benchmarks/eina/eina_bench_crc_hash.c
index b673448..7750233 100644
--- a/src/benchmarks/eina/eina_bench_crc_hash.c
+++ b/src/benchmarks/eina/eina_bench_crc_hash.c
@@ -26,6 +26,7 @@
26uint64_t CityHash64(const char *buf, size_t len); 26uint64_t CityHash64(const char *buf, size_t len);
27#endif 27#endif
28 28
29int key_size;
29char *key_str=NULL; 30char *key_str=NULL;
30 31
31void repchar(int n) 32void repchar(int n)
diff --git a/src/benchmarks/elementary/meson.build b/src/benchmarks/elementary/meson.build
index 6685ffc..8cb1b99 100644
--- a/src/benchmarks/elementary/meson.build
+++ b/src/benchmarks/elementary/meson.build
@@ -5,6 +5,7 @@ focus_widget_tree_bench = executable('focus_widget_tree_bench',
5 5
6benchmark('focus_widget_tree', focus_widget_tree_bench, 6benchmark('focus_widget_tree', focus_widget_tree_bench,
7 args: ['5'], 7 args: ['5'],
8 timeout: 60
8) 9)
9 10
10item_container = executable('collection', 11item_container = executable('collection',
@@ -12,4 +13,4 @@ item_container = executable('collection',
12 dependencies: [elementary, ecore_input_evas, eio], 13 dependencies: [elementary, ecore_input_evas, eio],
13) 14)
14 15
15benchmark('item_container', item_container) 16benchmark('item_container', item_container, timeout: 60)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index c9bbc17..b110292 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -419,6 +419,8 @@ static void st_collections_group_parts_part_description_text_repch(void);
419static void st_collections_group_parts_part_description_text_size(void); 419static void st_collections_group_parts_part_description_text_size(void);
420static void st_collections_group_parts_part_description_text_size_range(void); 420static void st_collections_group_parts_part_description_text_size_range(void);
421static void st_collections_group_parts_part_description_text_fit(void); 421static void st_collections_group_parts_part_description_text_fit(void);
422static void st_collections_group_parts_part_description_text_fit_step(void);
423static void st_collections_group_parts_part_description_text_fit_size_array(void);
422static void st_collections_group_parts_part_description_text_min(void); 424static void st_collections_group_parts_part_description_text_min(void);
423static void st_collections_group_parts_part_description_text_max(void); 425static void st_collections_group_parts_part_description_text_max(void);
424static void st_collections_group_parts_part_description_text_align(void); 426static void st_collections_group_parts_part_description_text_align(void);
@@ -514,6 +516,9 @@ static void st_collections_group_parts_part_description_params_bool(void);
514static void st_collections_group_parts_part_description_params_choice(void); 516static void st_collections_group_parts_part_description_params_choice(void);
515static void st_collections_group_parts_part_description_params_smart(void); 517static void st_collections_group_parts_part_description_params_smart(void);
516 518
519/* vector part parameter */
520static void st_collections_group_parts_part_description_vector_frame(void);
521
517static void ob_collections_group_programs_program(void); 522static void ob_collections_group_programs_program(void);
518static void st_collections_group_programs_program_name(void); 523static void st_collections_group_programs_program_name(void);
519static void st_collections_group_programs_program_signal(void); 524static void st_collections_group_programs_program_signal(void);
@@ -952,6 +957,8 @@ New_Statement_Handler statement_handlers[] =
952 {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size}, 957 {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size},
953 {"collections.group.parts.part.description.text.size_range", st_collections_group_parts_part_description_text_size_range}, 958 {"collections.group.parts.part.description.text.size_range", st_collections_group_parts_part_description_text_size_range},
954 {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit}, 959 {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit},
960 {"collections.group.parts.part.description.text.fit_step", st_collections_group_parts_part_description_text_fit_step},
961 {"collections.group.parts.part.description.text.fit_size_array", st_collections_group_parts_part_description_text_fit_size_array},
955 {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min}, 962 {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min},
956 {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max}, 963 {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max},
957 {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align}, 964 {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align},
@@ -1043,6 +1050,7 @@ New_Statement_Handler statement_handlers[] =
1043 {"collections.group.parts.part.description.params.bool", st_collections_group_parts_part_description_params_bool}, 1050 {"collections.group.parts.part.description.params.bool", st_collections_group_parts_part_description_params_bool},
1044 {"collections.group.parts.part.description.params.choice", st_collections_group_parts_part_description_params_choice}, 1051 {"collections.group.parts.part.description.params.choice", st_collections_group_parts_part_description_params_choice},
1045 {"collections.group.parts.part.description.params.*", st_collections_group_parts_part_description_params_smart}, 1052 {"collections.group.parts.part.description.params.*", st_collections_group_parts_part_description_params_smart},
1053 {"collections.group.parts.part.description.vector.frame", st_collections_group_parts_part_description_vector_frame},
1046 IMAGE_STATEMENTS("collections.group.parts.part.description.") 1054 IMAGE_STATEMENTS("collections.group.parts.part.description.")
1047 { 1055 {
1048 "collections.group.parts.part.description.font", st_fonts_font 1056 "collections.group.parts.part.description.font", st_fonts_font
@@ -1586,6 +1594,7 @@ New_Object_Handler object_handlers[] =
1586 {"collections.group.parts.part.description.map.zoom", NULL}, 1594 {"collections.group.parts.part.description.map.zoom", NULL},
1587 {"collections.group.parts.part.description.perspective", NULL}, 1595 {"collections.group.parts.part.description.perspective", NULL},
1588 {"collections.group.parts.part.description.params", NULL}, 1596 {"collections.group.parts.part.description.params", NULL},
1597 {"collections.group.parts.part.description.vector", NULL},
1589 {"collections.group.parts.part.description.color_classes", NULL}, /* dup */ 1598 {"collections.group.parts.part.description.color_classes", NULL}, /* dup */
1590 {"collections.group.parts.part.description.color_classes.color_class", ob_color_class}, /* dup */ 1599 {"collections.group.parts.part.description.color_classes.color_class", ob_color_class}, /* dup */
1591 {"collections.group.parts.part.description.text_classes", NULL}, /* dup */ 1600 {"collections.group.parts.part.description.text_classes", NULL}, /* dup */
@@ -2541,6 +2550,7 @@ _handle_vector_image(void)
2541 { 2550 {
2542 ed->vg.set = EINA_TRUE; 2551 ed->vg.set = EINA_TRUE;
2543 ed->vg.id = edje_file->image_dir->vectors[i].id; 2552 ed->vg.id = edje_file->image_dir->vectors[i].id;
2553 ed->vg.type = edje_file->image_dir->vectors[i].type;
2544 break; 2554 break;
2545 } 2555 }
2546 } 2556 }
@@ -2583,6 +2593,7 @@ st_images_vector(void)
2583 Edje_Vector_Directory_Entry *vector; 2593 Edje_Vector_Directory_Entry *vector;
2584 const char *tmp; 2594 const char *tmp;
2585 unsigned int i; 2595 unsigned int i;
2596 size_t entry_len;
2586 2597
2587 check_min_arg_count(1); 2598 check_min_arg_count(1);
2588 2599
@@ -2614,6 +2625,16 @@ st_images_vector(void)
2614 2625
2615 vector->entry = tmp; 2626 vector->entry = tmp;
2616 vector->id = edje_file->image_dir->vectors_count - 1; 2627 vector->id = edje_file->image_dir->vectors_count - 1;
2628
2629 entry_len = strlen(vector->entry);
2630 if ((entry_len > 5) && !strncmp(vector->entry + entry_len - 5, ".json", 5))
2631 {
2632 vector->type = EDJE_VECTOR_FILE_TYPE_JSON;
2633 }
2634 else
2635 {
2636 vector->type = EDJE_VECTOR_FILE_TYPE_SVG;
2637 }
2617} 2638}
2618 2639
2619/** 2640/**
@@ -8956,6 +8977,8 @@ st_collections_group_parts_part_description_inherit(void)
8956 Edje_Part_Description_Vector *iparent = (Edje_Part_Description_Vector *)parent; 8977 Edje_Part_Description_Vector *iparent = (Edje_Part_Description_Vector *)parent;
8957 ied->vg.set = iparent->vg.set; 8978 ied->vg.set = iparent->vg.set;
8958 ied->vg.id = iparent->vg.id; 8979 ied->vg.id = iparent->vg.id;
8980 ied->vg.type = iparent->vg.type;
8981 ied->vg.frame = iparent->vg.frame;
8959 break; 8982 break;
8960 } 8983 }
8961 } 8984 }
@@ -11654,6 +11677,83 @@ st_collections_group_parts_part_description_text_fit(void)
11654 ed->text.fit_y = parse_bool(1); 11677 ed->text.fit_y = parse_bool(1);
11655} 11678}
11656 11679
11680
11681/**
11682 @page edcref
11683
11684 @property
11685 fit_step
11686 @parameters
11687 [font step size in points (pt)]
11688 @effect
11689 Sets the font step size for the text part. when fitting text
11690
11691 Defaults: 1
11692 @since 1.24.0
11693 @endproperty
11694 */
11695static void
11696st_collections_group_parts_part_description_text_fit_step(void)
11697{
11698 Edje_Part_Description_Text *ed;
11699
11700 check_arg_count(1);
11701
11702 if (current_part->type != EDJE_PART_TYPE_TEXTBLOCK)
11703 {
11704 ERR("parse error %s:%i. text attributes in non-TEXTBLOCK part.",
11705 file_in, line - 1);
11706 exit(-1);
11707 }
11708
11709 ed = (Edje_Part_Description_Text *)current_desc;
11710
11711 ed->text.fit_step = parse_int(0);
11712
11713 if (ed->text.fit_step < 1)
11714 {
11715 ERR("parse error %s:%i. fit step less than 1.",
11716 file_in, line - 1);
11717 exit(-1);
11718 }
11719}
11720
11721/**
11722 @page edcref
11723
11724 @property
11725 fit
11726 @parameters
11727 [Array of font sizes in points]
11728 @effect
11729 Sets the allowed font sizes array for the text part.
11730 @since 1.24.0
11731 @endproperty
11732 */
11733static void
11734st_collections_group_parts_part_description_text_fit_size_array(void)
11735{
11736 int n, argc;
11737 Edje_Part_Description_Text *ed;
11738
11739 if (current_part->type != EDJE_PART_TYPE_TEXTBLOCK)
11740 {
11741 ERR("parse error %s:%i. text attributes in non-TEXTBLOCK part.",
11742 file_in, line - 1);
11743 exit(-1);
11744 }
11745
11746 ed = (Edje_Part_Description_Text *)current_desc;
11747 check_min_arg_count(1);
11748
11749 for (n = 0, argc = get_arg_count(); n < argc; n++)
11750 {
11751 unsigned int *value = malloc(sizeof(unsigned int));
11752 if (value) *value = (unsigned int) parse_int(n);
11753 ed->text.fit_size_array = eina_list_append(ed->text.fit_size_array, value);
11754 }
11755}
11756
11657/** 11757/**
11658 @page edcref 11758 @page edcref
11659 11759
@@ -15154,6 +15254,25 @@ st_collections_group_parts_part_description_params_choice(void)
15154 _st_collections_group_parts_part_description_params(EDJE_EXTERNAL_PARAM_TYPE_CHOICE); 15254 _st_collections_group_parts_part_description_params(EDJE_EXTERNAL_PARAM_TYPE_CHOICE);
15155} 15255}
15156 15256
15257static void
15258st_collections_group_parts_part_description_vector_frame(void)
15259{
15260 Edje_Part_Description_Vector *ed;
15261
15262 check_arg_count(1);
15263
15264 if (current_part->type != EDJE_PART_TYPE_VECTOR)
15265 {
15266 ERR("parse error %s:%i. vector attributes in non-VECTOR part.",
15267 file_in, line - 1);
15268 exit(-1);
15269 }
15270
15271 ed = (Edje_Part_Description_Vector *)current_desc;
15272
15273 ed->vg.frame = parse_float_range(0, 0.0, 1.0);
15274}
15275
15157/** @edcsubsection{collections_group_parts_description_links, 15276/** @edcsubsection{collections_group_parts_description_links,
15158 * Group.Parts.Part.Description.Links} */ 15277 * Group.Parts.Part.Description.Links} */
15159 15278
@@ -15666,6 +15785,12 @@ st_collections_group_programs_program_action(void)
15666 "PHYSICS_STOP", EDJE_ACTION_TYPE_PHYSICS_STOP, 15785 "PHYSICS_STOP", EDJE_ACTION_TYPE_PHYSICS_STOP,
15667 "PHYSICS_ROT_SET", EDJE_ACTION_TYPE_PHYSICS_ROT_SET, 15786 "PHYSICS_ROT_SET", EDJE_ACTION_TYPE_PHYSICS_ROT_SET,
15668 "PLAY_VIBRATION", EDJE_ACTION_TYPE_VIBRATION_SAMPLE, 15787 "PLAY_VIBRATION", EDJE_ACTION_TYPE_VIBRATION_SAMPLE,
15788 "VG_ANIM_STOP", EDJE_ACTION_TYPE_VG_ANIM_STOP,
15789 "VG_ANIM_PAUSE", EDJE_ACTION_TYPE_VG_ANIM_PAUSE,
15790 "VG_ANIM_RESUME", EDJE_ACTION_TYPE_VG_ANIM_RESUME,
15791 "VG_ANIM_PLAY", EDJE_ACTION_TYPE_VG_ANIM_PLAY,
15792 "VG_ANIM_REWIND", EDJE_ACTION_TYPE_VG_ANIM_REWIND,
15793 "VG_ANIM_LOOP", EDJE_ACTION_TYPE_VG_ANIM_LOOP,
15669 NULL); 15794 NULL);
15670 if (ep->action == EDJE_ACTION_TYPE_STATE_SET) 15795 if (ep->action == EDJE_ACTION_TYPE_STATE_SET)
15671 { 15796 {
@@ -15827,6 +15952,12 @@ st_collections_group_programs_program_action(void)
15827 case EDJE_ACTION_TYPE_ACTION_STOP: 15952 case EDJE_ACTION_TYPE_ACTION_STOP:
15828 case EDJE_ACTION_TYPE_PHYSICS_FORCES_CLEAR: 15953 case EDJE_ACTION_TYPE_PHYSICS_FORCES_CLEAR:
15829 case EDJE_ACTION_TYPE_PHYSICS_STOP: 15954 case EDJE_ACTION_TYPE_PHYSICS_STOP:
15955 case EDJE_ACTION_TYPE_VG_ANIM_STOP:
15956 case EDJE_ACTION_TYPE_VG_ANIM_PAUSE:
15957 case EDJE_ACTION_TYPE_VG_ANIM_RESUME:
15958 case EDJE_ACTION_TYPE_VG_ANIM_PLAY:
15959 case EDJE_ACTION_TYPE_VG_ANIM_REWIND:
15960 case EDJE_ACTION_TYPE_VG_ANIM_LOOP:
15830 check_arg_count(1); 15961 check_arg_count(1);
15831 break; 15962 break;
15832 15963
@@ -16106,6 +16237,12 @@ _program_target_add(char *name)
16106 case EDJE_ACTION_TYPE_PHYSICS_STOP: 16237 case EDJE_ACTION_TYPE_PHYSICS_STOP:
16107 case EDJE_ACTION_TYPE_PHYSICS_ROT_SET: 16238 case EDJE_ACTION_TYPE_PHYSICS_ROT_SET:
16108#endif 16239#endif
16240 case EDJE_ACTION_TYPE_VG_ANIM_STOP:
16241 case EDJE_ACTION_TYPE_VG_ANIM_PAUSE:
16242 case EDJE_ACTION_TYPE_VG_ANIM_RESUME:
16243 case EDJE_ACTION_TYPE_VG_ANIM_PLAY:
16244 case EDJE_ACTION_TYPE_VG_ANIM_REWIND:
16245 case EDJE_ACTION_TYPE_VG_ANIM_LOOP:
16109 data_queue_part_lookup(pc, name, &(et->id)); 16246 data_queue_part_lookup(pc, name, &(et->id));
16110 break; 16247 break;
16111 16248
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index f932eac..4c192ef 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -1428,19 +1428,48 @@ data_write_vectors(Eet_File *ef, int *vector_num)
1428 if (!f) continue; 1428 if (!f) continue;
1429 eina_file_close(f); 1429 eina_file_close(f);
1430 1430
1431 if (efl_file_set(vg, eina_strbuf_string_get(buf))) 1431 if (vector->type == EDJE_VECTOR_FILE_TYPE_JSON)
1432 error_and_abort(ef, "Failed to parse svg : %s", vector->entry); 1432 {
1433 if (efl_file_load(vg)) 1433 char *json_data = NULL;
1434 error_and_abort(ef, "Failed to parse svg : %s", vector->entry); 1434 int json_data_len = 0;
1435 1435
1436 eina_strbuf_reset(buf); 1436 f = eina_file_open(eina_strbuf_string_get(buf), EINA_FALSE);
1437 eina_strbuf_append_printf(buf, "edje/vectors/%i", vector->id); 1437 if (!f) continue;
1438 if (!efl_file_save(vg, eet_file_get(ef), eina_strbuf_string_get(buf), NULL))
1439 error_and_abort(ef, "Failed to write data in Eet for svg :%s", vector->entry);
1440 1438
1441 *vector_num += 1; 1439 json_data_len = (int) eina_file_size_get(f);
1442 found = EINA_TRUE; 1440 json_data = eina_file_map_all(f, EINA_FILE_POPULATE);
1443 break; 1441
1442 eina_strbuf_reset(buf);
1443 eina_strbuf_append_printf(buf, "edje/vectors/%i", vector->id);
1444 eet_write(ef, eina_strbuf_string_get(buf), json_data, json_data_len, EET_COMPRESSION_NONE);
1445
1446 eina_file_map_free(f, json_data);
1447 eina_file_close(f);
1448
1449 *vector_num += 1;
1450 found = EINA_TRUE;
1451 break;
1452 }
1453 else
1454 {
1455 f = eina_file_open(eina_strbuf_string_get(buf), EINA_FALSE);
1456 if (!f) continue;
1457 eina_file_close(f);
1458
1459 if (efl_file_set(vg, eina_strbuf_string_get(buf)))
1460 error_and_abort(ef, "Failed to parse svg : %s", vector->entry);
1461 if (efl_file_load(vg))
1462 error_and_abort(ef, "Failed to parse svg : %s", vector->entry);
1463
1464 eina_strbuf_reset(buf);
1465 eina_strbuf_append_printf(buf, "edje/vectors/%i", vector->id);
1466 if (!efl_file_save(vg, eet_file_get(ef), eina_strbuf_string_get(buf), NULL))
1467 error_and_abort(ef, "Failed to write data in Eet for svg :%s", vector->entry);
1468
1469 *vector_num += 1;
1470 found = EINA_TRUE;
1471 break;
1472 }
1444 } 1473 }
1445 if (!found) 1474 if (!found)
1446 error_and_abort(ef, "Unable to find the svg :%s", vector->entry); 1475 error_and_abort(ef, "Unable to find the svg :%s", vector->entry);
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index cacfdf2..d54dea9 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -31,12 +31,16 @@ struct opts
31 Eina_Bool print; 31 Eina_Bool print;
32 Eina_Bool slave_mode; 32 Eina_Bool slave_mode;
33 double scale; 33 double scale;
34 int pad;
34 char *title; 35 char *title;
35}; 36};
36 37
37static Eina_Bool _edje_load_or_show_error(Evas_Object *edje, const char *file, const char *group); 38static Eina_Bool _edje_load_or_show_error(Evas_Object *edje, const char *file, const char *group);
38 39
39static Ecore_Evas *win; 40static Ecore_Evas *win;
41static Evas *evas;
42static Evas_Object *bg, *bg2 = NULL, *edje;
43static struct opts opts;
40 44
41static void 45static void
42_win_title_set(const char *group, const char *file) 46_win_title_set(const char *group, const char *file)
@@ -754,71 +758,37 @@ _print_message(void *data EINA_UNUSED, Evas_Object *edje EINA_UNUSED, Edje_Messa
754} 758}
755 759
756static void 760static void
757_reset_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *stack, void *event_info EINA_UNUSED) 761_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
758{
759 Evas_Coord minw, minh;
760 Evas_Object *edje = data;
761
762 edje_object_size_min_get(edje, &minw, &minh);
763 if ((minw <= 0) && (minh <= 0))
764 edje_object_size_min_calc(edje, &minw, &minh);
765
766 evas_object_size_hint_min_set(stack, minw, minh);
767}
768
769static void
770_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *stack EINA_UNUSED, void *event_info)
771{ 762{
772 Evas_Event_Key_Down *ev = event_info; 763 Evas_Event_Key_Down *ev = event_info;
773 struct opts *opts = data;
774 764
775 if ((!strcmp(ev->keyname, "equal")) || 765 if ((!strcmp(ev->keyname, "equal")) ||
776 (!strcmp(ev->keyname, "plus"))) 766 (!strcmp(ev->keyname, "plus")))
777 opts->scale += 0.1; 767 opts.scale += 0.1;
778 else if ((!strcmp(ev->keyname, "minus")) || 768 else if ((!strcmp(ev->keyname, "minus")) ||
779 (!strcmp(ev->keyname, "underscore"))) 769 (!strcmp(ev->keyname, "underscore")))
780 opts->scale -= 0.1; 770 opts.scale -= 0.1;
781 else if ((!strcmp(ev->keyname, "0"))) 771 else if ((!strcmp(ev->keyname, "0")))
782 opts->scale = 1.0; 772 opts.scale = 1.0;
783 if (opts->scale < 0.1) opts->scale = 0.1; 773 if (opts.scale < 0.1) opts.scale = 0.1;
784 else if (opts->scale > 10.0) 774 else if (opts.scale > 10.0)
785 opts->scale = 1.0; 775 opts.scale = 10.0;
786 edje_scale_set(opts->scale); 776 edje_scale_set(opts.scale);
787}
788
789static Evas_Object *
790_create_stack(Evas *evas, const struct opts *opts)
791{
792 Evas_Object *stack = evas_object_box_add(evas);
793 if (!stack)
794 {
795 fputs("ERROR: could not create object stack (box).\n", stderr);
796 return NULL;
797 }
798 evas_object_box_layout_set(stack, evas_object_box_layout_stack, NULL, NULL);
799 evas_object_resize(stack, opts->size.w, opts->size.h);
800 evas_object_size_hint_weight_set(stack, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
801 evas_object_size_hint_align_set(stack, EVAS_HINT_FILL, EVAS_HINT_FILL);
802 evas_object_show(stack);
803 return stack;
804} 777}
805 778
806static Evas_Object * 779static Evas_Object *
807_create_bg(Evas *evas, const struct opts *opts) 780_create_bg(void)
808{ 781{
809 const unsigned char *color = opts->color; 782 const unsigned char *color = opts.color;
810 Evas_Object *bg = evas_object_rectangle_add(evas); 783 Evas_Object *o = evas_object_rectangle_add(evas);
811 if (!bg) 784 if (!o)
812 { 785 {
813 fputs("ERROR: could not create background.\n", stderr); 786 fputs("ERROR: could not create background.\n", stderr);
814 return NULL; 787 return NULL;
815 } 788 }
816 evas_object_resize(bg, opts->size.w, opts->size.h); 789 evas_object_color_set(o, color[0], color[1], color[2], 255);
817 evas_object_color_set(bg, color[0], color[1], color[2], 255); 790 evas_object_show(o);
818 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 791 return o;
819 evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
820 evas_object_show(bg);
821 return bg;
822} 792}
823 793
824static void 794static void
@@ -827,7 +797,6 @@ _edje_reload(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA
827 const char *file; 797 const char *file;
828 const char *group; 798 const char *group;
829 edje_object_signal_callback_del(obj, "edje,change,file", "edje", _edje_reload); 799 edje_object_signal_callback_del(obj, "edje,change,file", "edje", _edje_reload);
830
831 edje_object_file_get(obj, &file, &group); 800 edje_object_file_get(obj, &file, &group);
832 _edje_load_or_show_error(obj, file, group); 801 _edje_load_or_show_error(obj, file, group);
833} 802}
@@ -899,73 +868,73 @@ _edje_load_or_show_error(Evas_Object *edje, const char *file, const char *group)
899} 868}
900 869
901static Evas_Object * 870static Evas_Object *
902_create_edje(Evas *evas, const struct opts *opts) 871_create_edje(void)
903{ 872{
904 Evas_Coord minw, minh, maxw, maxh; 873 Evas_Coord minw, minh, maxw, maxh;
905 Evas_Object *edje = edje_object_add(evas); 874 Evas_Object *o = edje_object_add(evas);
906 if (!edje) 875 if (!o)
907 { 876 {
908 fputs("ERROR: could not create edje.\n", stderr); 877 fputs("ERROR: could not create edje.\n", stderr);
909 return NULL; 878 return NULL;
910 } 879 }
911 880
912 if (opts->group) 881 if (opts.group)
913 { 882 {
914 if (!_edje_load_or_show_error(edje, opts->file, opts->group)) 883 if (!_edje_load_or_show_error(o, opts.file, opts.group))
915 { 884 {
916 evas_object_del(edje); 885 evas_object_del(edje);
917 return NULL; 886 return NULL;
918 } 887 }
919 if (!opts->title) _win_title_set(opts->group, opts->file); 888 if (!opts.title) _win_title_set(opts.group, opts.file);
920 } 889 }
921 else 890 else
922 { 891 {
923 if (edje_file_group_exists(opts->file, "main")) 892 if (edje_file_group_exists(opts.file, "main"))
924 { 893 {
925 if (!_edje_load_or_show_error(edje, opts->file, "main")) 894 if (!_edje_load_or_show_error(o, opts.file, "main"))
926 { 895 {
927 evas_object_del(edje); 896 evas_object_del(edje);
928 return NULL; 897 return NULL;
929 } 898 }
930 if (!opts->title) _win_title_set("main", opts->file); 899 if (!opts.title) _win_title_set("main", opts.file);
931 } 900 }
932 else 901 else
933 { 902 {
934 Eina_List *groups = edje_file_collection_list(opts->file); 903 Eina_List *groups = edje_file_collection_list(opts.file);
935 const char *group; 904 const char *group;
936 if (!groups) 905 if (!groups)
937 { 906 {
938 fprintf(stderr, "ERROR: file '%s' has no groups!\n", 907 fprintf(stderr, "ERROR: file '%s' has no groups!\n",
939 opts->file); 908 opts.file);
940 evas_object_del(edje); 909 evas_object_del(edje);
941 return NULL; 910 return NULL;
942 } 911 }
943 group = groups->data; 912 group = groups->data;
944 if (!_edje_load_or_show_error(edje, opts->file, group)) 913 if (!_edje_load_or_show_error(o, opts.file, group))
945 { 914 {
946 edje_file_collection_list_free(groups); 915 edje_file_collection_list_free(groups);
947 evas_object_del(edje); 916 evas_object_del(edje);
948 return NULL; 917 return NULL;
949 } 918 }
950 if (!opts->title) _win_title_set(group, opts->file); 919 if (!opts.title) _win_title_set(group, opts.file);
951 edje_file_collection_list_free(groups); 920 edje_file_collection_list_free(groups);
952 } 921 }
953 } 922 }
954 evas_object_smart_callback_add(edje, "circular,dependency", _edje_circul, opts->group); 923 evas_object_smart_callback_add(o, "circular,dependency", _edje_circul, opts.group);
955 924
956 edje_object_size_max_get(edje, &maxw, &maxh); 925 edje_object_size_max_get(o, &maxw, &maxh);
957 edje_object_size_min_get(edje, &minw, &minh); 926 edje_object_size_min_get(o, &minw, &minh);
958 if ((minw <= 0) && (minh <= 0)) 927 if ((minw <= 0) && (minh <= 0))
959 edje_object_size_min_calc(edje, &minw, &minh); 928 edje_object_size_min_calc(o, &minw, &minh);
960 929
961 evas_object_size_hint_max_set(edje, maxw, maxh); 930 ecore_evas_size_max_set(win,
962 evas_object_size_hint_min_set(edje, minw, minh); 931 maxw > 0 ? (maxw + opts.pad * 2) : 0,
932 maxh > 0 ? (maxh + opts.pad * 2) : 0);
933 ecore_evas_size_min_set(win, (minw + opts.pad * 2), (minh + opts.pad * 2));
963 934
964 evas_object_size_hint_weight_set(edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 935 evas_object_show(o);
965 evas_object_size_hint_align_set(edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
966 evas_object_show(edje);
967 936
968 return edje; 937 return o;
969} 938}
970 939
971static unsigned char 940static unsigned char
@@ -988,6 +957,18 @@ _cb_delete(EINA_UNUSED Ecore_Evas *ee)
988 ecore_main_loop_quit(); 957 ecore_main_loop_quit();
989} 958}
990 959
960static void
961_cb_resize(Ecore_Evas *ee)
962{
963 int w, h;
964 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
965 evas_object_move(edje, opts.pad, opts.pad);
966 evas_object_resize(edje, w - (opts.pad * 2), h - (opts.pad * 2));
967 evas_object_move(bg, opts.pad, opts.pad);
968 evas_object_resize(bg, w - (opts.pad * 2), h - (opts.pad * 2));
969 if (bg2) evas_object_resize(bg2, w, h);
970}
971
991const Ecore_Getopt optdesc = { 972const Ecore_Getopt optdesc = {
992 "edje_player", 973 "edje_player",
993 "%prog [options] <filename.edj>", 974 "%prog [options] <filename.edj>",
@@ -1010,8 +991,8 @@ const Ecore_Getopt optdesc = {
1010 ('Z', "size", "size to use in wxh form.", "WxH", 991 ('Z', "size", "size to use in wxh form.", "WxH",
1011 ecore_getopt_callback_size_parse, NULL), 992 ecore_getopt_callback_size_parse, NULL),
1012 ECORE_GETOPT_CALLBACK_ARGS 993 ECORE_GETOPT_CALLBACK_ARGS
1013 ('c', "bg-color", "Color of the background (if not shaped or alpha)", 994 ('c', "bg-color", "Color of the background (if not shaped or alpha) e.g. 255,150,50",
1014 "RRGGBB", _parse_color, NULL), 995 "R,G,B", _parse_color, NULL),
1015 ECORE_GETOPT_STORE_TRUE 996 ECORE_GETOPT_STORE_TRUE
1016 ('b', "borderless", "Display window without border."), 997 ('b', "borderless", "Display window without border."),
1017 ECORE_GETOPT_STORE_TRUE 998 ECORE_GETOPT_STORE_TRUE
@@ -1029,6 +1010,8 @@ const Ecore_Getopt optdesc = {
1029 ('S', "slave-mode", "Listen for commands on stdin"), 1010 ('S', "slave-mode", "Listen for commands on stdin"),
1030 ECORE_GETOPT_STORE_DOUBLE 1011 ECORE_GETOPT_STORE_DOUBLE
1031 ('z', "scale", "Set scale factor"), 1012 ('z', "scale", "Set scale factor"),
1013 ECORE_GETOPT_STORE_INT
1014 ('P', "pad", "Set pixel padding around object"),
1032 ECORE_GETOPT_LICENSE('L', "license"), 1015 ECORE_GETOPT_LICENSE('L', "license"),
1033 ECORE_GETOPT_COPYRIGHT('C', "copyright"), 1016 ECORE_GETOPT_COPYRIGHT('C', "copyright"),
1034 ECORE_GETOPT_VERSION('V', "version"), 1017 ECORE_GETOPT_VERSION('V', "version"),
@@ -1040,9 +1023,6 @@ const Ecore_Getopt optdesc = {
1040int 1023int
1041main(int argc, char **argv) 1024main(int argc, char **argv)
1042{ 1025{
1043 Evas *evas;
1044 Evas_Object *stack, *edje;
1045 struct opts opts;
1046 Eina_Bool quit_option = EINA_FALSE; 1026 Eina_Bool quit_option = EINA_FALSE;
1047 int args; 1027 int args;
1048 Eina_List *groups; 1028 Eina_List *groups;
@@ -1063,6 +1043,7 @@ main(int argc, char **argv)
1063 ECORE_GETOPT_VALUE_BOOL(opts.print), 1043 ECORE_GETOPT_VALUE_BOOL(opts.print),
1064 ECORE_GETOPT_VALUE_BOOL(opts.slave_mode), 1044 ECORE_GETOPT_VALUE_BOOL(opts.slave_mode),
1065 ECORE_GETOPT_VALUE_DOUBLE(opts.scale), 1045 ECORE_GETOPT_VALUE_DOUBLE(opts.scale),
1046 ECORE_GETOPT_VALUE_INT(opts.pad),
1066 ECORE_GETOPT_VALUE_BOOL(quit_option), 1047 ECORE_GETOPT_VALUE_BOOL(quit_option),
1067 ECORE_GETOPT_VALUE_BOOL(quit_option), 1048 ECORE_GETOPT_VALUE_BOOL(quit_option),
1068 ECORE_GETOPT_VALUE_BOOL(quit_option), 1049 ECORE_GETOPT_VALUE_BOOL(quit_option),
@@ -1160,37 +1141,32 @@ main(int argc, char **argv)
1160 1141
1161 ecore_evas_callback_delete_request_set(win, _cb_delete); 1142 ecore_evas_callback_delete_request_set(win, _cb_delete);
1162 evas = ecore_evas_get(win); 1143 evas = ecore_evas_get(win);
1163 stack = _create_stack(evas, &opts);
1164 if (!stack)
1165 {
1166 goto free_ecore_evas;
1167 }
1168
1169 ecore_evas_object_associate(win, stack, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
1170 1144
1171 if (opts.alpha) 1145 if (opts.alpha)
1172 ecore_evas_alpha_set(win, EINA_TRUE); 1146 ecore_evas_alpha_set(win, EINA_TRUE);
1173 else if (opts.shaped) 1147 else if (opts.shaped)
1174 ecore_evas_shaped_set(win, EINA_TRUE); 1148 ecore_evas_shaped_set(win, EINA_TRUE);
1175 else
1176 {
1177 Evas_Object *bg = _create_bg(evas, &opts);
1178 if (bg) evas_object_box_append(stack, bg);
1179 }
1180 1149
1181 edje = _create_edje(evas, &opts); 1150 if (opts.pad > 0)
1182 if (edje)
1183 evas_object_box_append(stack, edje);
1184 else
1185 { 1151 {
1186 goto free_ecore_evas; 1152 bg2 = evas_object_rectangle_add(evas);
1153 evas_object_resize(bg2, opts.size.w, opts.size.h);
1154 if (opts.alpha)
1155 evas_object_color_set(bg2, 0, 0, 0, 64);
1156 else
1157 evas_object_color_set(bg2, 64, 64, 64, 255);
1158 evas_object_show(bg2);
1187 } 1159 }
1160 bg = _create_bg();
1161
1162 edje = _create_edje();
1163 if (!edje) goto free_ecore_evas;
1188 1164
1189 evas_object_focus_set(stack, EINA_TRUE); 1165 ecore_evas_callback_resize_set(win, _cb_resize);
1190 evas_object_event_callback_add(stack, EVAS_CALLBACK_KEY_DOWN, 1166 _cb_resize(win);
1167 evas_object_focus_set(bg, EINA_TRUE);
1168 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN,
1191 _key_down, &opts); 1169 _key_down, &opts);
1192 evas_object_event_callback_add(stack, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
1193 _reset_size_hints, edje);
1194 1170
1195 if (opts.print) 1171 if (opts.print)
1196 { 1172 {
diff --git a/src/bin/efreet/efreetd_ipc.c b/src/bin/efreet/efreetd_ipc.c
index 933abfc..0992345 100644
--- a/src/bin/efreet/efreetd_ipc.c
+++ b/src/bin/efreet/efreetd_ipc.c
@@ -18,6 +18,7 @@ static Ecore_Event_Handler *hnd_add = NULL;
18static Ecore_Event_Handler *hnd_del = NULL; 18static Ecore_Event_Handler *hnd_del = NULL;
19static Ecore_Event_Handler *hnd_data = NULL; 19static Ecore_Event_Handler *hnd_data = NULL;
20static int clients = 0; 20static int clients = 0;
21static Ecore_Timer *quit_timer_start = NULL;
21static Ecore_Timer *quit_timer = NULL; 22static Ecore_Timer *quit_timer = NULL;
22 23
23static Eina_Bool 24static Eina_Bool
@@ -28,6 +29,15 @@ _cb_quit_timer(void *data EINA_UNUSED)
28 return EINA_FALSE; 29 return EINA_FALSE;
29} 30}
30 31
32static Eina_Bool
33_cb_quit_timer_start(void *data EINA_UNUSED)
34{
35 quit_timer_start = NULL;
36 if (quit_timer) ecore_timer_del(quit_timer);
37 quit_timer = ecore_timer_add(10.0, _cb_quit_timer, NULL);
38 return EINA_FALSE;
39}
40
31static void 41static void
32_broadcast(Ecore_Ipc_Server *svr, int major, int minor, void *data, int size) 42_broadcast(Ecore_Ipc_Server *svr, int major, int minor, void *data, int size)
33{ 43{
@@ -101,6 +111,11 @@ _cb_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
101 ecore_timer_del(quit_timer); 111 ecore_timer_del(quit_timer);
102 quit_timer = NULL; 112 quit_timer = NULL;
103 } 113 }
114 if (quit_timer_start)
115 {
116 ecore_timer_del(quit_timer_start);
117 quit_timer_start = NULL;
118 }
104 clients++; 119 clients++;
105 return ECORE_CALLBACK_DONE; 120 return ECORE_CALLBACK_DONE;
106} 121}
@@ -211,7 +226,7 @@ ipc_init(void)
211 ecore_ipc_shutdown(); 226 ecore_ipc_shutdown();
212 return EINA_FALSE; 227 return EINA_FALSE;
213 } 228 }
214 quit_timer = ecore_timer_add(2.0, _cb_quit_timer, NULL); 229 quit_timer_start = ecore_timer_add(10.0, _cb_quit_timer_start, NULL);
215 hnd_add = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, 230 hnd_add = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD,
216 _cb_client_add, NULL); 231 _cb_client_add, NULL);
217 hnd_del = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, 232 hnd_del = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL,
@@ -228,6 +243,10 @@ ipc_shutdown(void)
228 if (init <= 0) return EINA_TRUE; 243 if (init <= 0) return EINA_TRUE;
229 init--; 244 init--;
230 if (init > 0) return EINA_TRUE; 245 if (init > 0) return EINA_TRUE;
246 if (quit_timer) ecore_timer_del(quit_timer);
247 if (quit_timer_start) ecore_timer_del(quit_timer_start);
248 quit_timer = NULL;
249 quit_timer_start = NULL;
231 ecore_ipc_server_del(ipc); 250 ecore_ipc_server_del(ipc);
232 ecore_event_handler_del(hnd_add); 251 ecore_event_handler_del(hnd_add);
233 ecore_event_handler_del(hnd_del); 252 ecore_event_handler_del(hnd_del);
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index 342e184..0f8d793 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -139,6 +139,7 @@ elementary_test_src = [
139 'test_ui_table.c', 139 'test_ui_table.c',
140 'test_ui_popup.c', 140 'test_ui_popup.c',
141 'test_ui_textpath.c', 141 'test_ui_textpath.c',
142 'test_canvas_textblock.c',
142 'test_video.c', 143 'test_video.c',
143 'test_weather.c', 144 'test_weather.c',
144 'test_web.c', 145 'test_web.c',
@@ -160,16 +161,19 @@ elementary_test_src = [
160 'test_ui_collection_view.c', 161 'test_ui_collection_view.c',
161 'test_ui_items.c', 162 'test_ui_items.c',
162 'test_ui_frame.c', 163 'test_ui_frame.c',
163 'test_efl_ui_animation_view.c', 164 'test_ui_separator.c',
165 'test_efl_ui_vg_animation.c',
164 'test_efl_gfx_vg_value_provider.c', 166 'test_efl_gfx_vg_value_provider.c',
165 'test.h' 167 'test.h'
166] 168]
167 169
168if sys_windows == false 170if sys_windows == false
169 link_args = ['-rdynamic', '-fPIC', '-pie'] 171 link_args = ['-rdynamic', '-fPIC', '-pie']
172 link_args_lib = ['-rdynamic', '-fPIC']
170 package_c_args = package_c_args + ['-fPIC'] 173 package_c_args = package_c_args + ['-fPIC']
171else 174else
172 link_args = [] 175 link_args = []
176 link_args_lib = []
173endif 177endif
174elementary_test = executable('elementary_test', 178elementary_test = executable('elementary_test',
175 elementary_test_src, 179 elementary_test_src,
@@ -183,6 +187,18 @@ elementary_test = executable('elementary_test',
183 link_args: link_args 187 link_args: link_args
184) 188)
185 189
190library('elementary_test',
191 elementary_test_src,
192 dependencies: [elementary] + elementary_deps + elementary_pub_deps,
193 install: false,
194 c_args : package_c_args + [
195 '-Delementary_test_BIN_DIR="'+dir_bin+'"',
196 '-Delementary_test_LIB_DIR="'+dir_lib+'"',
197 '-Delementary_test_DATA_DIR="'+join_paths(dir_data,'elementary')+'"'
198 ],
199 link_args: link_args_lib
200)
201
186elementary_config_src = [ 202elementary_config_src = [
187 'config.c' 203 'config.c'
188] 204]
diff --git a/src/bin/elementary/perf_test_01.c b/src/bin/elementary/perf_test_01.c
index d29f848..ef7f32d 100644
--- a/src/bin/elementary/perf_test_01.c
+++ b/src/bin/elementary/perf_test_01.c
@@ -36,9 +36,9 @@ TST(01, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord win_w, Evas_Coord win_h
36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2); 36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2); 37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
38 x = (win_w / 2) - (w / 2); 38 x = (win_w / 2) - (w / 2);
39 x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2)); 39 x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0));
40 y = (win_h / 2) - (h / 2); 40 y = (win_h / 2) - (h / 2);
41 y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2)); 41 y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0));
42 evas_object_geometry_set(o, x, y, w, h); 42 evas_object_geometry_set(o, x, y, w, h);
43 } 43 }
44} 44}
diff --git a/src/bin/elementary/perf_test_02.c b/src/bin/elementary/perf_test_02.c
index ac381c7..e5f10f1 100644
--- a/src/bin/elementary/perf_test_02.c
+++ b/src/bin/elementary/perf_test_02.c
@@ -36,9 +36,9 @@ TST(02, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord win_w, Evas_Coord win_h
36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2); 36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2); 37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
38 x = (win_w / 2) - (w / 2); 38 x = (win_w / 2) - (w / 2);
39 x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2)); 39 x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0));
40 y = (win_h / 2) - (h / 2); 40 y = (win_h / 2) - (h / 2);
41 y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2)); 41 y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0));
42 evas_object_geometry_set(o, x, y, w, h); 42 evas_object_geometry_set(o, x, y, w, h);
43 } 43 }
44} 44}
diff --git a/src/bin/elementary/perf_test_03.c b/src/bin/elementary/perf_test_03.c
index 6737bed..ab35044 100644
--- a/src/bin/elementary/perf_test_03.c
+++ b/src/bin/elementary/perf_test_03.c
@@ -36,9 +36,9 @@ TST(03, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord win_w, Evas_Coord win_h
36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2); 36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2); 37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
38 x = (win_w / 2) - (w / 2); 38 x = (win_w / 2) - (w / 2);
39 x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2)); 39 x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0));
40 y = (win_h / 2) - (h / 2); 40 y = (win_h / 2) - (h / 2);
41 y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2)); 41 y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0));
42 evas_object_geometry_set(o, x, y, w, h); 42 evas_object_geometry_set(o, x, y, w, h);
43 } 43 }
44} 44}
diff --git a/src/bin/elementary/perf_test_04.c b/src/bin/elementary/perf_test_04.c
index 17aae98..d593096 100644
--- a/src/bin/elementary/perf_test_04.c
+++ b/src/bin/elementary/perf_test_04.c
@@ -36,9 +36,9 @@ TST(04, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord win_w, Evas_Coord win_h
36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2); 36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2); 37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
38 x = (win_w / 2) - (w / 2); 38 x = (win_w / 2) - (w / 2);
39 x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2); 39 x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0);
40 y = (win_h / 2) - (h / 2); 40 y = (win_h / 2) - (h / 2);
41 y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2); 41 y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0);
42 evas_object_geometry_set(o, x, y, w, h); 42 evas_object_geometry_set(o, x, y, w, h);
43 } 43 }
44} 44}
diff --git a/src/bin/elementary/perf_test_05.c b/src/bin/elementary/perf_test_05.c
index 64618ae..1016952 100644
--- a/src/bin/elementary/perf_test_05.c
+++ b/src/bin/elementary/perf_test_05.c
@@ -36,9 +36,9 @@ TST(05, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord win_w, Evas_Coord win_h
36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2); 36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2); 37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
38 x = (win_w / 2) - (w / 2); 38 x = (win_w / 2) - (w / 2);
39 x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2); 39 x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0);
40 y = (win_h / 2) - (h / 2); 40 y = (win_h / 2) - (h / 2);
41 y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2); 41 y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0);
42 evas_object_geometry_set(o, x, y, w, h); 42 evas_object_geometry_set(o, x, y, w, h);
43 } 43 }
44} 44}
diff --git a/src/bin/elementary/perf_test_06.c b/src/bin/elementary/perf_test_06.c
index 952a4bc..d227d65 100644
--- a/src/bin/elementary/perf_test_06.c
+++ b/src/bin/elementary/perf_test_06.c
@@ -36,9 +36,9 @@ TST(06, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord win_w, Evas_Coord win_h
36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2); 36 w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2); 37 h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
38 x = (win_w / 2) - (w / 2); 38 x = (win_w / 2) - (w / 2);
39 x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2); 39 x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0);
40 y = (win_h / 2) - (h / 2); 40 y = (win_h / 2) - (h / 2);
41 y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2); 41 y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0);
42 evas_object_geometry_set(o, x, y, w, h); 42 evas_object_geometry_set(o, x, y, w, h);
43 } 43 }
44} 44}
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 1d91bf5..d522400 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -240,9 +240,11 @@ void test_flip_page_eo(void *data, Evas_Object *obj, void *event_info);
240void test_label(void *data, Evas_Object *obj, void *event_info); 240void test_label(void *data, Evas_Object *obj, void *event_info);
241void test_label_slide(void *data, Evas_Object *obj, void *event_info); 241void test_label_slide(void *data, Evas_Object *obj, void *event_info);
242void test_label_wrap(void *data, Evas_Object *obj, void *event_info); 242void test_label_wrap(void *data, Evas_Object *obj, void *event_info);
243void test_textblock_fit(void *data, Evas_Object *obj, void *event_info);
243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info); 244void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info);
244void test_label_colors(void *data, Evas_Object *obj, void *event_info); 245void test_label_colors(void *data, Evas_Object *obj, void *event_info);
245void test_label_emoji(void *data, Evas_Object *obj, void *event_info); 246void test_label_emoji(void *data, Evas_Object *obj, void *event_info);
247void test_label_variation_sequence(void *data, Evas_Object *obj, void *event_info);
246void test_conformant(void *data, Evas_Object *obj, void *event_info); 248void test_conformant(void *data, Evas_Object *obj, void *event_info);
247void test_conformant2(void *data, Evas_Object *obj, void *event_info); 249void test_conformant2(void *data, Evas_Object *obj, void *event_info);
248void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info); 250void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info);
@@ -372,6 +374,7 @@ void test_evas_snapshot(void *data, Evas_Object *obj, void *event_info);
372void test_evas_map(void *data, Edje_Object *obj, void *event_info); 374void test_evas_map(void *data, Edje_Object *obj, void *event_info);
373void test_efl_gfx_mapping(void *data, Edje_Object *obj, void *event_info); 375void test_efl_gfx_mapping(void *data, Edje_Object *obj, void *event_info);
374void test_ui_textpath(void *data, Edje_Object *obj, void *event_info); 376void test_ui_textpath(void *data, Edje_Object *obj, void *event_info);
377void test_canvas_textblock(void *data, Edje_Object *obj, void *event_info);
375 378
376void test_efl_anim_alpha(void *data, Evas_Object *obj, void *event_info); 379void test_efl_anim_alpha(void *data, Evas_Object *obj, void *event_info);
377void test_efl_anim_rotate(void *data, Evas_Object *obj, void *event_info); 380void test_efl_anim_rotate(void *data, Evas_Object *obj, void *event_info);
@@ -404,8 +407,9 @@ void test_efl_ui_collection_view(void *data, Evas_Object *obj, void *event_info)
404void test_efl_ui_item(void *data, Evas_Object *obj, void *event_info); 407void test_efl_ui_item(void *data, Evas_Object *obj, void *event_info);
405void test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); 408void test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
406 409
407void test_efl_ui_animation_view(void *data, Evas_Object *obj, void *event_info); 410void test_efl_ui_vg_animation(void *data, Evas_Object *obj, void *event_info);
408void test_efl_gfx_vg_value_provider(void *data, Evas_Object *obj, void *event_info); 411void test_efl_gfx_vg_value_provider(void *data, Evas_Object *obj, void *event_info);
412void test_ui_separator(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_info EINA_UNUSED);
409 413
410static void _list_udpate(void); 414static void _list_udpate(void);
411 415
@@ -937,9 +941,9 @@ add_tests:
937 ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2); 941 ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2);
938 ADD_TEST(NULL, "Entries", "Entry Emoticon", test_entry_emoticon); 942 ADD_TEST(NULL, "Entries", "Entry Emoticon", test_entry_emoticon);
939 ADD_TEST(NULL, "Entries", "Entry Password", test_entry_password); 943 ADD_TEST(NULL, "Entries", "Entry Password", test_entry_password);
940 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text", test_efl_ui_text); 944 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox", test_efl_ui_text);
941 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Input Field", test_efl_ui_text_inputfield); 945 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Input Field", test_efl_ui_text_inputfield);
942 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Label", test_efl_ui_text_label); 946 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Label", test_efl_ui_text_label);
943 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Tags", test_ui_tags); 947 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Tags", test_ui_tags);
944 948
945 //------------------------------// 949 //------------------------------//
@@ -1148,7 +1152,7 @@ add_tests:
1148 // FIXME: add frame test 1152 // FIXME: add frame test
1149 ADD_TEST(NULL, "Boundaries", "Bubble", test_bubble); 1153 ADD_TEST(NULL, "Boundaries", "Bubble", test_bubble);
1150 ADD_TEST(NULL, "Boundaries", "Separator", test_separator); 1154 ADD_TEST(NULL, "Boundaries", "Separator", test_separator);
1151 1155 ADD_TEST_EO(NULL, "Boundaries", "Separator", test_ui_separator);
1152 //------------------------------// 1156 //------------------------------//
1153 ADD_TEST(NULL, "Range Values", "Spinner", test_spinner); 1157 ADD_TEST(NULL, "Range Values", "Spinner", test_spinner);
1154 ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Spin", test_ui_spin); 1158 ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Spin", test_ui_spin);
@@ -1205,10 +1209,13 @@ add_tests:
1205 ADD_TEST(NULL, "Text", "Label", test_label); 1209 ADD_TEST(NULL, "Text", "Label", test_label);
1206 ADD_TEST(NULL, "Text", "Label Slide", test_label_slide); 1210 ADD_TEST(NULL, "Text", "Label Slide", test_label_slide);
1207 ADD_TEST(NULL, "Text", "Label Wrap", test_label_wrap); 1211 ADD_TEST(NULL, "Text", "Label Wrap", test_label_wrap);
1212 ADD_TEST(NULL, "Text", "Textblock Fit", test_textblock_fit);
1208 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis); 1213 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis);
1209 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors); 1214 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors);
1210 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji); 1215 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji);
1216 ADD_TEST(NULL, "Text", "Label Variation Sequnece", test_label_variation_sequence);
1211 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath); 1217 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath);
1218 ADD_TEST_EO(NULL, "Text", "Efl.Canvas.Textblock style", test_canvas_textblock);
1212 1219
1213 //------------------------------// 1220 //------------------------------//
1214 ADD_TEST(NULL, "Stored Surface Buffer", "Launcher", test_launcher); 1221 ADD_TEST(NULL, "Stored Surface Buffer", "Launcher", test_launcher);
@@ -1299,7 +1306,7 @@ add_tests:
1299 ADD_TEST_EO(NULL, "Widgets Part", "Part Shadow", test_part_shadow); 1306 ADD_TEST_EO(NULL, "Widgets Part", "Part Shadow", test_part_shadow);
1300 1307
1301 //------------------------------// 1308 //------------------------------//
1302 ADD_TEST_EO(NULL, "Vector Animation", "Animation View", test_efl_ui_animation_view); 1309 ADD_TEST_EO(NULL, "Vector Animation", "Vector Graphics Animation", test_efl_ui_vg_animation);
1303 ADD_TEST_EO(NULL, "Vector Animation", "Value Provider", test_efl_gfx_vg_value_provider); 1310 ADD_TEST_EO(NULL, "Vector Animation", "Value Provider", test_efl_gfx_vg_value_provider);
1304 1311
1305#undef ADD_TEST 1312#undef ADD_TEST
@@ -1355,7 +1362,7 @@ add_tests:
1355 } 1362 }
1356 1363
1357 /* set an initial window size */ 1364 /* set an initial window size */
1358 evas_object_resize(win, 480 * elm_config_scale_get(), 480 * elm_config_scale_get()); 1365 evas_object_resize(win, 480 * elm_config_scale_get(), 490 * elm_config_scale_get());
1359 evas_object_show(win); 1366 evas_object_show(win);
1360} 1367}
1361 1368
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index 29fdeec..c4a0b0b 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -332,7 +332,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
332 Evas_Object *win, *box, *cs; 332 Evas_Object *win, *box, *cs;
333 char buf[PATH_MAX]; 333 char buf[PATH_MAX];
334 334
335 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 335 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
336 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"), 336 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"),
337 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 337 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
338 efl_ui_win_alpha_set(efl_added, 1)); 338 efl_ui_win_alpha_set(efl_added, 1));
@@ -408,7 +408,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
408 Evas_Object *rd, *c; 408 Evas_Object *rd, *c;
409 char buf[PATH_MAX]; 409 char buf[PATH_MAX];
410 410
411 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 411 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
412 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"), 412 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"),
413 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 413 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
414 efl_ui_win_alpha_set(efl_added, EINA_FALSE)); 414 efl_ui_win_alpha_set(efl_added, EINA_FALSE));
diff --git a/src/bin/elementary/test_calendar.c b/src/bin/elementary/test_calendar.c
index b3f54f5..8c5fc85d 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -433,7 +433,7 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
433 current_date = time(NULL) + SEC_PER_YEAR; 433 current_date = time(NULL) + SEC_PER_YEAR;
434 localtime_r(&current_date, &max_date); 434 localtime_r(&current_date, &max_date);
435 435
436 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 436 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
437 efl_text_set(efl_added, "Efl Ui Calendar"), 437 efl_text_set(efl_added, "Efl Ui Calendar"),
438 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 438 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
439 439
diff --git a/src/bin/elementary/test_canvas_textblock.c b/src/bin/elementary/test_canvas_textblock.c
new file mode 100644
index 0000000..92d2fb0
--- /dev/null
+++ b/src/bin/elementary/test_canvas_textblock.c
@@ -0,0 +1,64 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4#include <Efl_Ui.h>
5#include <Elementary.h>
6
7static void
8_apply_style(const Eo *input, Eo *textblock)
9{
10 const char *style = efl_text_get(input);
11 efl_canvas_textblock_style_apply(textblock, style);
12}
13
14static void
15_style_changed_cb(void *data, const Efl_Event *ev)
16{
17 _apply_style(ev->object, data);
18}
19
20
21void
22test_canvas_textblock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
23{
24 Eo *win, *box, *textblock, *input;
25 const char *default_style;
26
27 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
28 efl_text_set(efl_added, "Efl.Canvas.Textblock style"),
29 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
30
31 box = efl_add(EFL_UI_BOX_CLASS, win,
32 efl_content_set(win, efl_added),
33 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
34
35 efl_add(EFL_UI_TEXTBOX_CLASS, box,
36 efl_gfx_hint_weight_set(efl_added, 1, 0),
37 efl_text_interactive_selection_allowed_set(efl_added, EINA_FALSE),
38 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
39 efl_text_set(efl_added, "Live style editor. Enter a style string below:"),
40 efl_pack(box, efl_added));
41
42 input = efl_add(EFL_UI_TEXTBOX_CLASS, box,
43 efl_gfx_hint_weight_set(efl_added, 1, 0),
44 efl_text_set(efl_added, "font=Sans font_size=24 color=white"),
45 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 48)),
46 efl_text_multiline_set(efl_added, EINA_TRUE),
47 efl_text_wrap_set(efl_added, EFL_TEXT_FORMAT_WRAP_WORD),
48 efl_pack(box, efl_added));
49 efl_ui_textbox_scrollable_set(input, EINA_TRUE);
50
51 textblock = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, box,
52 efl_text_multiline_set(efl_added, EINA_TRUE),
53 efl_text_set(efl_added, "This is a sample text block."),
54 efl_pack(box, efl_added));
55
56 efl_event_callback_add(input, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
57 _style_changed_cb, textblock),
58
59 efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 240));
60
61 default_style = efl_canvas_textblock_all_styles_get(textblock);
62 printf("Default style string: %s\n", default_style);
63 _apply_style(input, textblock);
64}
diff --git a/src/bin/elementary/test_check.c b/src/bin/elementary/test_check.c
index 40ca00d..b47145e 100644
--- a/src/bin/elementary/test_check.c
+++ b/src/bin/elementary/test_check.c
@@ -29,25 +29,18 @@ state_changed_cb2(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EIN
29 elm_object_text_set(obj, "text is visible when check state is true."); 29 elm_object_text_set(obj, "text is visible when check state is true.");
30} 30}
31 31
32void 32static void
33test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 33check_style(Evas_Object *win, Evas_Object *bx, const char *style)
34{ 34{
35 Evas_Object *win, *bx, *ic, *ck, *ck0; 35 Evas_Object *ic, *ck, *ck0;
36 char buf[PATH_MAX]; 36 char buf[PATH_MAX];
37 37
38 win = elm_win_util_standard_add("check", "Check");
39 elm_win_autodel_set(win, EINA_TRUE);
40
41 bx = elm_box_add(win);
42 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
43 elm_win_resize_object_add(win, bx);
44 evas_object_show(bx);
45
46 ic = elm_icon_add(win); 38 ic = elm_icon_add(win);
47 snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); 39 snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
48 elm_image_file_set(ic, buf, NULL); 40 elm_image_file_set(ic, buf, NULL);
49 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); 41 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
50 ck = elm_check_add(win); 42 ck = elm_check_add(win);
43 elm_object_style_set(ck, style);
51 elm_object_text_set(ck, "Icon sized to check"); 44 elm_object_text_set(ck, "Icon sized to check");
52 elm_object_part_content_set(ck, "icon", ic); 45 elm_object_part_content_set(ck, "icon", ic);
53 elm_check_state_set(ck, EINA_TRUE); 46 elm_check_state_set(ck, EINA_TRUE);
@@ -62,6 +55,7 @@ test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
62 elm_image_file_set(ic, buf, NULL); 55 elm_image_file_set(ic, buf, NULL);
63 elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE); 56 elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
64 ck = elm_check_add(win); 57 ck = elm_check_add(win);
58 elm_object_style_set(ck, style);
65 elm_object_text_set(ck, "Icon not resizable"); 59 elm_object_text_set(ck, "Icon not resizable");
66 elm_object_part_content_set(ck, "icon", ic); 60 elm_object_part_content_set(ck, "icon", ic);
67 elm_box_pack_end(bx, ck); 61 elm_box_pack_end(bx, ck);
@@ -71,17 +65,20 @@ test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
71 evas_object_smart_callback_add(ck, "changed", changed_cb, ck0); 65 evas_object_smart_callback_add(ck, "changed", changed_cb, ck0);
72 66
73 ck = elm_check_add(win); 67 ck = elm_check_add(win);
68 elm_object_style_set(ck, style);
74 elm_object_text_set(ck, "Label Only"); 69 elm_object_text_set(ck, "Label Only");
75 elm_box_pack_end(bx, ck); 70 elm_box_pack_end(bx, ck);
76 evas_object_show(ck); 71 evas_object_show(ck);
77 72
78 ck = elm_check_add(win); 73 ck = elm_check_add(win);
74 elm_object_style_set(ck, style);
79 elm_object_text_set(ck, "Use State Pointer"); 75 elm_object_text_set(ck, "Use State Pointer");
80 elm_check_state_pointer_set(ck, &eb); 76 elm_check_state_pointer_set(ck, &eb);
81 elm_box_pack_end(bx, ck); 77 elm_box_pack_end(bx, ck);
82 evas_object_show(ck); 78 evas_object_show(ck);
83 79
84 ck = elm_check_add(win); 80 ck = elm_check_add(win);
81 elm_object_style_set(ck, style);
85 elm_object_text_set(ck, "Print State Pointer Value"); 82 elm_object_text_set(ck, "Print State Pointer Value");
86 elm_box_pack_end(bx, ck); 83 elm_box_pack_end(bx, ck);
87 evas_object_show(ck); 84 evas_object_show(ck);
@@ -92,6 +89,7 @@ test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
92 elm_image_file_set(ic, buf, NULL); 89 elm_image_file_set(ic, buf, NULL);
93 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); 90 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
94 ck = elm_check_add(win); 91 ck = elm_check_add(win);
92 elm_object_style_set(ck, style);
95 elm_object_text_set(ck, "Disabled check"); 93 elm_object_text_set(ck, "Disabled check");
96 elm_object_part_content_set(ck, "icon", ic); 94 elm_object_part_content_set(ck, "icon", ic);
97 elm_check_state_set(ck, EINA_TRUE); 95 elm_check_state_set(ck, EINA_TRUE);
@@ -101,6 +99,7 @@ test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
101 evas_object_show(ic); 99 evas_object_show(ic);
102 100
103 ck = elm_check_add(win); 101 ck = elm_check_add(win);
102 elm_object_style_set(ck, style);
104 elm_box_pack_end(bx, ck); 103 elm_box_pack_end(bx, ck);
105 elm_object_disabled_set(ck, EINA_TRUE); 104 elm_object_disabled_set(ck, EINA_TRUE);
106 evas_object_show(ck); 105 evas_object_show(ck);
@@ -110,21 +109,63 @@ test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
110 elm_image_file_set(ic, buf, NULL); 109 elm_image_file_set(ic, buf, NULL);
111 elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE); 110 elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
112 ck = elm_check_add(win); 111 ck = elm_check_add(win);
112 elm_object_style_set(ck, style);
113 elm_object_part_content_set(ck, "icon", ic); 113 elm_object_part_content_set(ck, "icon", ic);
114 elm_box_pack_end(bx, ck); 114 elm_box_pack_end(bx, ck);
115 evas_object_show(ck); 115 evas_object_show(ck);
116 evas_object_show(ic); 116 evas_object_show(ic);
117 117
118 ck = elm_check_add(win); 118 ck = elm_check_add(win);
119 elm_object_style_set(ck, style);
119 elm_box_pack_end(bx, ck); 120 elm_box_pack_end(bx, ck);
120 evas_object_show(ck); 121 evas_object_show(ck);
121 122
122 ck = elm_check_add(win); 123 ck = elm_check_add(win);
124 elm_object_style_set(ck, style);
123 elm_box_pack_end(bx, ck); 125 elm_box_pack_end(bx, ck);
124 elm_object_text_set(ck, "text is visible when check state is true."); 126 elm_object_text_set(ck, "text is visible when check state is true.");
125 elm_check_state_set(ck, EINA_TRUE); 127 elm_check_state_set(ck, EINA_TRUE);
126 evas_object_show(ck); 128 evas_object_show(ck);
127 evas_object_smart_callback_add(ck, "changed", state_changed_cb2, NULL); 129 evas_object_smart_callback_add(ck, "changed", state_changed_cb2, NULL);
130}
131
132void
133test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
134{
135 Evas_Object *win, *bx, *bx0;
136
137 win = elm_win_util_standard_add("check", "Check");
138 elm_win_autodel_set(win, EINA_TRUE);
139
140 bx0 = elm_box_add(win);
141 evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
142 elm_box_horizontal_set(bx0, EINA_TRUE);
143 elm_win_resize_object_add(win, bx0);
144 evas_object_show(bx0);
145
146 bx = elm_box_add(win);
147 elm_box_horizontal_set(bx, EINA_FALSE);
148 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
149 elm_box_pack_end(bx0, bx);
150 evas_object_show(bx);
151
152 check_style(win, bx, "default");
153
154 bx = elm_box_add(win);
155 elm_box_horizontal_set(bx, EINA_FALSE);
156 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
157 elm_box_pack_end(bx0, bx);
158 evas_object_show(bx);
159
160 check_style(win, bx, "plain");
161
162 bx = elm_box_add(win);
163 elm_box_horizontal_set(bx, EINA_FALSE);
164 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
165 elm_box_pack_end(bx0, bx);
166 evas_object_show(bx);
167
168 check_style(win, bx, "icon");
128 169
129 evas_object_show(win); 170 evas_object_show(win);
130} 171}
diff --git a/src/bin/elementary/test_efl_anim_alpha.c b/src/bin/elementary/test_efl_anim_alpha.c
index b364319..3c5f62c 100644
--- a/src/bin/elementary/test_efl_anim_alpha.c
+++ b/src/bin/elementary/test_efl_anim_alpha.c
@@ -90,13 +90,13 @@ test_efl_anim_alpha(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
90 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 90 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
91 91
92 //Show Animation 92 //Show Animation
93 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 93 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
94 efl_animation_alpha_set(show_anim, 0.0, 1.0); 94 efl_animation_alpha_set(show_anim, 0.0, 1.0);
95 efl_animation_duration_set(show_anim, 1.0); 95 efl_animation_duration_set(show_anim, 1.0);
96 efl_animation_final_state_keep_set(show_anim, EINA_TRUE); 96 efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
97 97
98 //Hide Animation 98 //Hide Animation
99 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 99 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
100 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 100 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
101 efl_animation_duration_set(hide_anim, 1.0); 101 efl_animation_duration_set(hide_anim, 1.0);
102 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); 102 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_anim_group_parallel.c b/src/bin/elementary/test_efl_anim_group_parallel.c
index 728c54e..d560023 100644
--- a/src/bin/elementary/test_efl_anim_group_parallel.c
+++ b/src/bin/elementary/test_efl_anim_group_parallel.c
@@ -88,19 +88,19 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
89 89
90 //Hide Animation 90 //Hide Animation
91 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 91 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
92 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 92 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
93 93
94 //Rotate from 0 to 45 degrees Animation 94 //Rotate from 0 to 45 degrees Animation
95 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 95 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
96 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5)); 96 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5));
97 97
98 //Scale Animation to zoom in 98 //Scale Animation to zoom in
99 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 99 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
100 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5)); 100 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5));
101 101
102 //Hide Parallel Group Animation 102 //Hide Parallel Group Animation
103 Efl_Canvas_Animation *parallel_hide_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS, win); 103 Efl_Canvas_Animation *parallel_hide_anim = efl_add(EFL_CANVAS_PARALLEL_GROUP_ANIMATION_CLASS, win);
104 efl_animation_duration_set(parallel_hide_anim, 1.0); 104 efl_animation_duration_set(parallel_hide_anim, 1.0);
105 efl_animation_final_state_keep_set(parallel_hide_anim, EINA_TRUE); 105 efl_animation_final_state_keep_set(parallel_hide_anim, EINA_TRUE);
106 106
diff --git a/src/bin/elementary/test_efl_anim_group_sequential.c b/src/bin/elementary/test_efl_anim_group_sequential.c
index 60b3a83..62b00a6 100644
--- a/src/bin/elementary/test_efl_anim_group_sequential.c
+++ b/src/bin/elementary/test_efl_anim_group_sequential.c
@@ -89,19 +89,19 @@ test_efl_anim_group_sequential(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
89 89
90 /* Animations to hide button */ 90 /* Animations to hide button */
91 //Rotate from 0 to 45 degrees Animation 91 //Rotate from 0 to 45 degrees Animation
92 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 92 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
93 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5)); 93 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5));
94 94
95 //Scale Animation to zoom in 95 //Scale Animation to zoom in
96 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 96 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
97 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5)); 97 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5));
98 98
99 //Hide Animation 99 //Hide Animation
100 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 100 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
101 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 101 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
102 102
103 //Hide Sequential Group Animation 103 //Hide Sequential Group Animation
104 Efl_Canvas_Animation *sequential_hide_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_CLASS, win); 104 Efl_Canvas_Animation *sequential_hide_anim = efl_add(EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_CLASS, win);
105 efl_animation_duration_set(sequential_hide_anim, 1.0); 105 efl_animation_duration_set(sequential_hide_anim, 1.0);
106 efl_animation_final_state_keep_set(sequential_hide_anim, EINA_TRUE); 106 efl_animation_final_state_keep_set(sequential_hide_anim, EINA_TRUE);
107 107
diff --git a/src/bin/elementary/test_efl_anim_interpolator.c b/src/bin/elementary/test_efl_anim_interpolator.c
index c5a828f..e6c42b7 100644
--- a/src/bin/elementary/test_efl_anim_interpolator.c
+++ b/src/bin/elementary/test_efl_anim_interpolator.c
@@ -202,7 +202,7 @@ test_efl_anim_interpolator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
202 ad->btn[i] = btn; 202 ad->btn[i] = btn;
203 203
204 Efl_Canvas_Animation *anim = 204 Efl_Canvas_Animation *anim =
205 efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); 205 efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win);
206 efl_animation_translate_set(anim, EINA_POSITION2D(0, 0), EINA_POSITION2D((WIN_W - BTN_W), 0)); 206 efl_animation_translate_set(anim, EINA_POSITION2D(0, 0), EINA_POSITION2D((WIN_W - BTN_W), 0));
207 efl_animation_duration_set(anim, 2.0); 207 efl_animation_duration_set(anim, 2.0);
208 efl_animation_final_state_keep_set(anim, EINA_FALSE); 208 efl_animation_final_state_keep_set(anim, EINA_FALSE);
diff --git a/src/bin/elementary/test_efl_anim_pause.c b/src/bin/elementary/test_efl_anim_pause.c
index 92d4b3e..8585b38 100644
--- a/src/bin/elementary/test_efl_anim_pause.c
+++ b/src/bin/elementary/test_efl_anim_pause.c
@@ -115,13 +115,13 @@ test_efl_anim_pause(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
115 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 115 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
116 116
117 //Show Animation 117 //Show Animation
118 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 118 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
119 efl_animation_alpha_set(show_anim, 0.0, 1.0); 119 efl_animation_alpha_set(show_anim, 0.0, 1.0);
120 efl_animation_duration_set(show_anim, 2.0); 120 efl_animation_duration_set(show_anim, 2.0);
121 efl_animation_final_state_keep_set(show_anim, EINA_TRUE); 121 efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
122 122
123 //Hide Animation 123 //Hide Animation
124 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 124 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
125 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 125 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
126 efl_animation_duration_set(hide_anim, 2.0); 126 efl_animation_duration_set(hide_anim, 2.0);
127 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); 127 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_anim_repeat.c b/src/bin/elementary/test_efl_anim_repeat.c
index b3dddcd..26e3d3f 100644
--- a/src/bin/elementary/test_efl_anim_repeat.c
+++ b/src/bin/elementary/test_efl_anim_repeat.c
@@ -137,13 +137,13 @@ test_efl_anim_repeat(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
137 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 137 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
138 138
139 //Show Animation 139 //Show Animation
140 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 140 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
141 efl_animation_alpha_set(show_anim, 0.0, 1.0); 141 efl_animation_alpha_set(show_anim, 0.0, 1.0);
142 efl_animation_duration_set(show_anim, 1.0); 142 efl_animation_duration_set(show_anim, 1.0);
143 efl_animation_final_state_keep_set(show_anim, EINA_TRUE); 143 efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
144 144
145 //Hide Animation 145 //Hide Animation
146 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 146 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
147 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 147 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
148 efl_animation_duration_set(hide_anim, 1.0); 148 efl_animation_duration_set(hide_anim, 1.0);
149 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); 149 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_anim_rotate.c b/src/bin/elementary/test_efl_anim_rotate.c
index 437d015..4e3434c 100644
--- a/src/bin/elementary/test_efl_anim_rotate.c
+++ b/src/bin/elementary/test_efl_anim_rotate.c
@@ -88,13 +88,13 @@ test_efl_anim_rotate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
89 89
90 //Rotate from 0 to 45 degrees Animation 90 //Rotate from 0 to 45 degrees Animation
91 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 91 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
92 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5)); 92 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5));
93 efl_animation_duration_set(cw_45_degrees_anim, 1.0); 93 efl_animation_duration_set(cw_45_degrees_anim, 1.0);
94 efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE); 94 efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE);
95 95
96 //Rotate from 45 to 0 degrees Animation 96 //Rotate from 45 to 0 degrees Animation
97 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 97 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
98 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, EINA_VECTOR2(0.5, 0.5)); 98 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, EINA_VECTOR2(0.5, 0.5));
99 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 99 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
100 efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE); 100 efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE);
@@ -147,13 +147,13 @@ test_efl_anim_rotate_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
147 evas_object_show(pivot); 147 evas_object_show(pivot);
148 148
149 //Rotate from 0 to 45 degrees Animation 149 //Rotate from 0 to 45 degrees Animation
150 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 150 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
151 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, pivot, EINA_VECTOR2(0.5, 0.5)); 151 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, pivot, EINA_VECTOR2(0.5, 0.5));
152 efl_animation_duration_set(cw_45_degrees_anim, 1.0); 152 efl_animation_duration_set(cw_45_degrees_anim, 1.0);
153 efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE); 153 efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE);
154 154
155 //Rotate from 45 to 0 degrees Animation 155 //Rotate from 45 to 0 degrees Animation
156 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 156 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
157 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, pivot, EINA_VECTOR2(0.5, 0.5)); 157 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, pivot, EINA_VECTOR2(0.5, 0.5));
158 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 158 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
159 efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE); 159 efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE);
@@ -206,13 +206,13 @@ test_efl_anim_rotate_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
206 evas_object_show(abs_center); 206 evas_object_show(abs_center);
207 207
208 //Rotate from 0 to 45 degrees Animation 208 //Rotate from 0 to 45 degrees Animation
209 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 209 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
210 efl_animation_rotate_absolute_set(cw_45_degrees_anim, 0.0, 45.0, EINA_POSITION2D(0, 0)); 210 efl_animation_rotate_absolute_set(cw_45_degrees_anim, 0.0, 45.0, EINA_POSITION2D(0, 0));
211 efl_animation_duration_set(cw_45_degrees_anim, 1.0); 211 efl_animation_duration_set(cw_45_degrees_anim, 1.0);
212 efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE); 212 efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE);
213 213
214 //Rotate from 45 to 0 degrees Animation 214 //Rotate from 45 to 0 degrees Animation
215 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 215 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win);
216 efl_animation_rotate_absolute_set(ccw_45_degrees_anim, 45.0, 0.0, EINA_POSITION2D(0, 0)); 216 efl_animation_rotate_absolute_set(ccw_45_degrees_anim, 45.0, 0.0, EINA_POSITION2D(0, 0));
217 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 217 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
218 efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE); 218 efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_anim_scale.c b/src/bin/elementary/test_efl_anim_scale.c
index 93ac1f7..6653772 100644
--- a/src/bin/elementary/test_efl_anim_scale.c
+++ b/src/bin/elementary/test_efl_anim_scale.c
@@ -88,13 +88,13 @@ test_efl_anim_scale(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
89 89
90 //Scale Animation to zoom in 90 //Scale Animation to zoom in
91 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 91 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
92 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5)); 92 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5));
93 efl_animation_duration_set(scale_double_anim, 1.0); 93 efl_animation_duration_set(scale_double_anim, 1.0);
94 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); 94 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE);
95 95
96 //Scale Animation to zoom out 96 //Scale Animation to zoom out
97 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 97 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
98 efl_animation_scale_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), NULL, EINA_VECTOR2(0.5, 0.5)); 98 efl_animation_scale_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), NULL, EINA_VECTOR2(0.5, 0.5));
99 efl_animation_duration_set(scale_half_anim, 1.0); 99 efl_animation_duration_set(scale_half_anim, 1.0);
100 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); 100 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE);
@@ -147,13 +147,13 @@ test_efl_anim_scale_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
147 evas_object_show(pivot); 147 evas_object_show(pivot);
148 148
149 //Scale Animation to zoom in 149 //Scale Animation to zoom in
150 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 150 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
151 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), pivot, EINA_VECTOR2(0.5, 0.5)); 151 efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), pivot, EINA_VECTOR2(0.5, 0.5));
152 efl_animation_duration_set(scale_double_anim, 1.0); 152 efl_animation_duration_set(scale_double_anim, 1.0);
153 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); 153 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE);
154 154
155 //Scale Animation to zoom out 155 //Scale Animation to zoom out
156 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 156 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
157 efl_animation_scale_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), pivot, EINA_VECTOR2(0.5, 0.5)); 157 efl_animation_scale_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), pivot, EINA_VECTOR2(0.5, 0.5));
158 efl_animation_duration_set(scale_half_anim, 1.0); 158 efl_animation_duration_set(scale_half_anim, 1.0);
159 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); 159 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE);
@@ -206,13 +206,13 @@ test_efl_anim_scale_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
206 evas_object_show(abs_center); 206 evas_object_show(abs_center);
207 207
208 //Scale Animation to zoom in 208 //Scale Animation to zoom in
209 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 209 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
210 efl_animation_scale_absolute_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), EINA_POSITION2D(0, 0)); 210 efl_animation_scale_absolute_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), EINA_POSITION2D(0, 0));
211 efl_animation_duration_set(scale_double_anim, 1.0); 211 efl_animation_duration_set(scale_double_anim, 1.0);
212 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); 212 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE);
213 213
214 //Scale Animation to zoom out 214 //Scale Animation to zoom out
215 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 215 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win);
216 efl_animation_scale_absolute_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), EINA_POSITION2D(0, 0)); 216 efl_animation_scale_absolute_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), EINA_POSITION2D(0, 0));
217 efl_animation_duration_set(scale_half_anim, 1.0); 217 efl_animation_duration_set(scale_half_anim, 1.0);
218 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); 218 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_anim_start_delay.c b/src/bin/elementary/test_efl_anim_start_delay.c
index 6ef663b..ae41fc7 100644
--- a/src/bin/elementary/test_efl_anim_start_delay.c
+++ b/src/bin/elementary/test_efl_anim_start_delay.c
@@ -102,13 +102,13 @@ test_efl_anim_start_delay(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
102 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 102 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
103 103
104 //Show Animation 104 //Show Animation
105 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 105 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
106 efl_animation_alpha_set(show_anim, 0.0, 1.0); 106 efl_animation_alpha_set(show_anim, 0.0, 1.0);
107 efl_animation_duration_set(show_anim, 1.0); 107 efl_animation_duration_set(show_anim, 1.0);
108 efl_animation_final_state_keep_set(show_anim, EINA_TRUE); 108 efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
109 109
110 //Hide Animation 110 //Hide Animation
111 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 111 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win);
112 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 112 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
113 efl_animation_duration_set(hide_anim, 1.0); 113 efl_animation_duration_set(hide_anim, 1.0);
114 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); 114 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_anim_translate.c b/src/bin/elementary/test_efl_anim_translate.c
index 7617be8..c1a3165 100644
--- a/src/bin/elementary/test_efl_anim_translate.c
+++ b/src/bin/elementary/test_efl_anim_translate.c
@@ -88,13 +88,13 @@ test_efl_anim_translate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad); 88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
89 89
90 //Translate Animation to right bottom relatively 90 //Translate Animation to right bottom relatively
91 Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); 91 Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win);
92 efl_animation_translate_set(translate_rb_anim, EINA_POSITION2D(0, 0), EINA_POSITION2D(100, 100)); 92 efl_animation_translate_set(translate_rb_anim, EINA_POSITION2D(0, 0), EINA_POSITION2D(100, 100));
93 efl_animation_duration_set(translate_rb_anim, 1.0); 93 efl_animation_duration_set(translate_rb_anim, 1.0);
94 efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE); 94 efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE);
95 95
96 //Translate Animation to left top relatively 96 //Translate Animation to left top relatively
97 Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); 97 Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win);
98 efl_animation_translate_set(translate_lt_anim, EINA_POSITION2D(100, 100), EINA_POSITION2D(0, 0)); 98 efl_animation_translate_set(translate_lt_anim, EINA_POSITION2D(100, 100), EINA_POSITION2D(0, 0));
99 efl_animation_duration_set(translate_lt_anim, 1.0); 99 efl_animation_duration_set(translate_lt_anim, 1.0);
100 efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE); 100 efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE);
@@ -147,13 +147,13 @@ test_efl_anim_translate_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_U
147 evas_object_show(abs_center); 147 evas_object_show(abs_center);
148 148
149 //Translate Animation to right bottom absolutely 149 //Translate Animation to right bottom absolutely
150 Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); 150 Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win);
151 efl_animation_translate_absolute_set(translate_rb_anim, EINA_POSITION2D(0, 0), EINA_POSITION2D(100, 100)); 151 efl_animation_translate_absolute_set(translate_rb_anim, EINA_POSITION2D(0, 0), EINA_POSITION2D(100, 100));
152 efl_animation_duration_set(translate_rb_anim, 1.0); 152 efl_animation_duration_set(translate_rb_anim, 1.0);
153 efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE); 153 efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE);
154 154
155 //Translate Animation to left top absolutely 155 //Translate Animation to left top absolutely
156 Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); 156 Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win);
157 efl_animation_translate_absolute_set(translate_lt_anim, EINA_POSITION2D(100, 100), EINA_POSITION2D(0, 0)); 157 efl_animation_translate_absolute_set(translate_lt_anim, EINA_POSITION2D(100, 100), EINA_POSITION2D(0, 0));
158 efl_animation_duration_set(translate_lt_anim, 1.0); 158 efl_animation_duration_set(translate_lt_anim, 1.0);
159 efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE); 159 efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE);
diff --git a/src/bin/elementary/test_efl_gfx_mapping.c b/src/bin/elementary/test_efl_gfx_mapping.c
index fecfc45..a895d82 100644
--- a/src/bin/elementary/test_efl_gfx_mapping.c
+++ b/src/bin/elementary/test_efl_gfx_mapping.c
@@ -46,7 +46,7 @@ test_efl_gfx_mapping(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
46 Evas_Object *win, *img; 46 Evas_Object *win, *img;
47 char buf[PATH_MAX]; 47 char buf[PATH_MAX];
48 48
49 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 49 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
50 efl_text_set(efl_added, "Efl Gfx Map"), 50 efl_text_set(efl_added, "Efl Gfx Map"),
51 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 51 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
52 52
diff --git a/src/bin/elementary/test_efl_gfx_vg_value_provider.c b/src/bin/elementary/test_efl_gfx_vg_value_provider.c
index 7f5add0..2b5c9ee 100644
--- a/src/bin/elementary/test_efl_gfx_vg_value_provider.c
+++ b/src/bin/elementary/test_efl_gfx_vg_value_provider.c
@@ -15,6 +15,12 @@
15 15
16#ifdef BUILD_VG_LOADER_JSON 16#ifdef BUILD_VG_LOADER_JSON
17 17
18typedef struct _App_Data
19{
20 Eo *label;
21 Eo *slider;
22} App_Data;
23
18Evas_Object *values[4], *anim_view; 24Evas_Object *values[4], *anim_view;
19Evas_Object *path_entry, *type_hoversel; 25Evas_Object *path_entry, *type_hoversel;
20 26
@@ -49,9 +55,7 @@ add_value_provider(char* new_path, char* new_type, char* new_values)
49 efl_gfx_vg_value_provider_stroke_color_set(vp, color[0], color[1], color[2], color[3]); 55 efl_gfx_vg_value_provider_stroke_color_set(vp, color[0], color[1], color[2], color[3]);
50 sprintf(new_type, "StrokeColor"); 56 sprintf(new_type, "StrokeColor");
51 } 57 }
52 58 efl_ui_vg_animation_value_provider_override(anim_view, vp);
53
54 efl_ui_animation_view_value_provider_override(anim_view, vp);
55 } 59 }
56 if (!strcmp(type, "StrokeWidth")) 60 if (!strcmp(type, "StrokeWidth"))
57 { 61 {
@@ -61,12 +65,54 @@ add_value_provider(char* new_path, char* new_type, char* new_values)
61 char* v = (char*)efl_text_get(values[0]); 65 char* v = (char*)efl_text_get(values[0]);
62 if (v) width = strtod(v, NULL); 66 if (v) width = strtod(v, NULL);
63 efl_gfx_vg_value_provider_stroke_width_set(vp, width); 67 efl_gfx_vg_value_provider_stroke_width_set(vp, width);
64 efl_ui_animation_view_value_provider_override(anim_view, vp); 68 efl_ui_vg_animation_value_provider_override(anim_view, vp);
65 evas_object_show(anim_view);
66 sprintf(new_path, "%s", path); 69 sprintf(new_path, "%s", path);
67 sprintf(new_type, "StrokeWidth"); 70 sprintf(new_type, "StrokeWidth");
68 sprintf(new_values, "%f", width); 71 sprintf(new_values, "%f", width);
69 } 72 }
73 if (strstr(type, "Tr"))
74 {
75 double value[2], value_cnt;
76 Eina_Matrix4 m;
77 Eo *vp = efl_add(EFL_GFX_VG_VALUE_PROVIDER_CLASS, anim_view);
78
79 efl_gfx_vg_value_provider_keypath_set(vp, (char*)path);
80
81 value_cnt = strstr(type, "Rotation") ? 1 : 2;
82 for( int i = 0; i < value_cnt; i++)
83 {
84 char* v = (char*)efl_text_get(values[i]);
85 if (v) value[i] = atof(v);
86 }
87
88 eina_matrix4_identity(&m);
89 if (!strcmp(type, "TrPosition"))
90 {
91 // Z projection
92 eina_matrix4_translate(&m, value[0], value[1], 0);
93 sprintf(new_type, "TrPosition");
94 sprintf(new_values, "%f %f",value[0], value[1]);
95
96 }
97 else if (!strcmp(type, "TrScale"))
98 {
99 // Z projection
100 eina_matrix4_scale(&m, value[0], value[1], 1);
101 sprintf(new_type, "TrScale");
102 sprintf(new_values, "%f %f",value[0], value[1]);
103 }
104 else if (!strcmp(type, "TrRotation"))
105 {
106 // Z projection
107 eina_matrix4_rotate(&m, value[0] * (M_PI / 180), EINA_MATRIX_AXIS_Z); //degree to radian
108 sprintf(new_values, "%f",value[0]);
109 sprintf(new_type, "TrRotation");
110 }
111
112 sprintf(new_path, "%s", path);
113 efl_gfx_vg_value_provider_transform_set(vp, &m);
114 efl_ui_vg_animation_value_provider_override(anim_view, vp);
115 }
70 return EINA_TRUE; 116 return EINA_TRUE;
71} 117}
72 118
@@ -78,15 +124,23 @@ btn_clicked_cb(void *data , const Efl_Event *ev )
78 if (!text) return; 124 if (!text) return;
79 125
80 if (!strcmp("Play", text)) 126 if (!strcmp("Play", text))
81 efl_ui_animation_view_play((Evas_Object*)data); 127 {
128 double speed = efl_player_playback_speed_get(anim_view);
129 efl_player_playback_speed_set(anim_view, speed < 0 ? speed * -1 : speed);
130 efl_player_playing_set(anim_view, EINA_TRUE);
131 }
82 else if (!strcmp("Pause", text)) 132 else if (!strcmp("Pause", text))
83 efl_ui_animation_view_pause((Evas_Object*)data); 133 efl_player_paused_set((Evas_Object*)data, EINA_TRUE);
84 else if (!strcmp("Resume", text)) 134 else if (!strcmp("Resume", text))
85 efl_ui_animation_view_resume((Evas_Object*)data); 135 efl_player_paused_set((Evas_Object*)data, EINA_FALSE);
86 else if (!strcmp("Play Back", text)) 136 else if (!strcmp("Play Backwards", text))
87 efl_ui_animation_view_play_back((Evas_Object*)data); 137 {
138 double speed = efl_player_playback_speed_get(anim_view);
139 efl_player_playback_speed_set(anim_view, speed > 0 ? speed * -1 : speed);
140 efl_player_playing_set(anim_view, EINA_TRUE);
141 }
88 else if (!strcmp("Stop", text)) 142 else if (!strcmp("Stop", text))
89 efl_ui_animation_view_stop((Evas_Object*)data); 143 efl_player_playing_set((Evas_Object*)data, EINA_FALSE);
90 else if (!strcmp("ADD", text)) 144 else if (!strcmp("ADD", text))
91 { 145 {
92 Evas_Object *list = (Evas_Object*)data; 146 Evas_Object *list = (Evas_Object*)data;
@@ -96,7 +150,7 @@ btn_clicked_cb(void *data , const Efl_Event *ev )
96 { 150 {
97 char buf[255]; 151 char buf[255];
98 //TODO: Even if there is the same path as the existing item, it is added without updating. 152 //TODO: Even if there is the same path as the existing item, it is added without updating.
99 // In efl_ui_animation_view, duplicate paths are managed. 153 // In efl_ui_vg_animation, duplicate paths are managed.
100 // However, animator (lottie) does not have an implementation that manages overridden values. 154 // However, animator (lottie) does not have an implementation that manages overridden values.
101 /*Eina_List *items = (Eina_List*)elm_list_items_get(list); 155 /*Eina_List *items = (Eina_List*)elm_list_items_get(list);
102 Eina_List *l; 156 Eina_List *l;
@@ -145,7 +199,7 @@ static void
145check_changed_cb(void *data, const Efl_Event *event) 199check_changed_cb(void *data, const Efl_Event *event)
146{ 200{
147 Evas_Object *anim_view = data; 201 Evas_Object *anim_view = data;
148 efl_ui_animation_view_auto_repeat_set(anim_view, efl_ui_selectable_selected_get(event->object)); 202 efl_player_playback_loop_set(anim_view, efl_ui_selectable_selected_get(event->object));
149} 203}
150 204
151static void 205static void
@@ -154,92 +208,34 @@ speed_changed_cb(void *data, const Efl_Event *event)
154 Evas_Object *anim_view = data; 208 Evas_Object *anim_view = data;
155 double speed = 1; 209 double speed = 1;
156 if (efl_ui_selectable_selected_get(event->object)) speed = 0.25; 210 if (efl_ui_selectable_selected_get(event->object)) speed = 0.25;
157 efl_ui_animation_view_speed_set(anim_view, speed); 211 efl_player_playback_speed_set(anim_view, speed);
158} 212}
159 213
160static void 214static void
161limit_frame_cb(void *data, const Efl_Event *event) 215limit_frame_cb(void *data, const Efl_Event *event)
162{ 216{
163 Evas_Object *anim_view = data; 217 Evas_Object *anim_view = data;
164 int frame_count = efl_ui_animation_view_frame_count_get(anim_view); 218 int frame_count = efl_ui_vg_animation_frame_count_get(anim_view);
165 printf("Total Frame Count : %d\n", frame_count); 219 printf("Total Frame Count : %d\n", frame_count);
166 if (efl_ui_selectable_selected_get(event->object)) 220 if (efl_ui_selectable_selected_get(event->object))
167 { 221 {
168 efl_ui_animation_view_min_frame_set(anim_view, 5); 222 efl_ui_vg_animation_min_frame_set(anim_view, 5);
169 efl_ui_animation_view_max_frame_set(anim_view, 10); 223 efl_ui_vg_animation_max_frame_set(anim_view, 10);
170 printf("Frames to show 5-10 only\n"); 224 printf("Frames to show 5-10 only\n");
171 } 225 }
172 else 226 else
173 { 227 {
174 efl_ui_animation_view_min_frame_set(anim_view, 0); 228 efl_ui_vg_animation_min_frame_set(anim_view, 0);
175 efl_ui_animation_view_max_frame_set(anim_view, frame_count); 229 efl_ui_vg_animation_max_frame_set(anim_view, frame_count);
176 printf("Showing all frames now\n"); 230 printf("Showing all frames now\n");
177 } 231 }
178} 232}
179 233
180static void 234static void
181update_anim_view_state(Evas_Object *anim_view, Evas_Object *label)
182{
183 Efl_Ui_Animation_View_State state = efl_ui_animation_view_state_get(anim_view);
184
185 switch (state)
186 {
187 case EFL_UI_ANIMATION_VIEW_STATE_NOT_READY:
188 efl_text_set(label, "State = Not Ready");
189 break;
190 case EFL_UI_ANIMATION_VIEW_STATE_PLAY:
191 efl_text_set(label, "State = Playing");
192 break;
193 case EFL_UI_ANIMATION_VIEW_STATE_PLAY_BACK:
194 efl_text_set(label, "State = Playing Back");
195 break;
196 case EFL_UI_ANIMATION_VIEW_STATE_PAUSE:
197 efl_text_set(label, "State = Paused");
198 break;
199 case EFL_UI_ANIMATION_VIEW_STATE_STOP:
200 efl_text_set(label, "State = Stopped");
201 break;
202 }
203}
204
205static void
206_play_updated(void *data, Evas_Object *obj, void *ev EINA_UNUSED)
207{
208 Evas_Object *slider = data;
209 efl_ui_range_value_set(slider, efl_ui_animation_view_progress_get(obj));
210}
211
212static void
213_state_update(void *data, Evas_Object *obj, void *ev EINA_UNUSED)
214{
215 Evas_Object *label = data;
216 update_anim_view_state(obj, label);
217}
218
219static void
220_play_done(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED)
221{
222 printf("done!\n");
223}
224
225static void
226_play_repeated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED)
227{
228 printf("repeated!\n");
229}
230
231static void
232_slider_changed_cb(void *data, const Efl_Event *ev) 235_slider_changed_cb(void *data, const Efl_Event *ev)
233{ 236{
234 Evas_Object *anim_view = data; 237 Evas_Object *anim_view = data;
235 efl_ui_animation_view_progress_set(anim_view, efl_ui_range_value_get(ev->object)); 238 efl_player_playback_progress_set(anim_view, efl_ui_range_value_get(ev->object));
236}
237
238static void
239_slider_reset(void *data, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED)
240{
241 Evas_Object *slider = data;
242 efl_ui_range_value_set(slider, 0);
243} 239}
244 240
245void values_input(Eo* box, const char* type) 241void values_input(Eo* box, const char* type)
@@ -258,7 +254,7 @@ void values_input(Eo* box, const char* type)
258 char color_text[4][2] = { "R", "G", "B", "A" }; 254 char color_text[4][2] = { "R", "G", "B", "A" };
259 for (int i = 0; i < 4; i++) 255 for (int i = 0; i < 4; i++)
260 { 256 {
261 values[i] = efl_add(EFL_UI_TEXT_CLASS, box, 257 values[i] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
262 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 258 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
263 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 259 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
264 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 260 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -270,7 +266,7 @@ void values_input(Eo* box, const char* type)
270 } 266 }
271 else if (!strcmp(type, "StrokeWidth")) 267 else if (!strcmp(type, "StrokeWidth"))
272 { 268 {
273 values[0] = efl_add(EFL_UI_TEXT_CLASS, box, 269 values[0] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
274 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 270 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
275 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 271 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
276 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 272 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -279,6 +275,37 @@ void values_input(Eo* box, const char* type)
279 efl_gfx_hint_size_min_set(values[0], EINA_SIZE2D(50, 10)); 275 efl_gfx_hint_size_min_set(values[0], EINA_SIZE2D(50, 10));
280 efl_text_set(efl_part(values[0], "efl.text_guide"), "Width(double type)"); 276 efl_text_set(efl_part(values[0], "efl.text_guide"), "Width(double type)");
281 } 277 }
278 else if (strstr(type, "Tr"))
279 {
280 char text[2][2];
281 if (!strcmp(type, "TrPosition"))
282 {
283 snprintf(text[0], sizeof(text[0]), "X");
284 snprintf(text[1], sizeof(text[1]), "Y");
285 }
286 else if (!strcmp(type, "TrScale"))
287 {
288 snprintf(text[0], sizeof(text[0]), "W");
289 snprintf(text[1], sizeof(text[1]), "H");
290 }
291 else if (!strcmp(type, "TrRotation"))
292 {
293 snprintf(text[0], sizeof(text[0]), "R");
294 }
295
296 int value_cnt = strstr(type, "Rotation") ? 1 : 2;
297 for( int i = 0; i < value_cnt; i++)
298 {
299 values[i] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
300 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
301 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
302 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
303 efl_text_interactive_editable_set(efl_added, EINA_TRUE),
304 efl_pack(box, efl_added));
305 efl_gfx_hint_size_min_set(values[i], EINA_SIZE2D(50, 10));
306 efl_text_set(efl_part(values[i], "efl.text_guide"), text[i]);
307 }
308 }
282} 309}
283 310
284static void 311static void
@@ -291,18 +318,102 @@ _hover_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
291 values_input(box, selected); 318 values_input(box, selected);
292} 319}
293 320
321static void
322update_anim_view_state(Evas_Object *anim_view, Evas_Object *label)
323{
324 Efl_Ui_Vg_Animation_State state = efl_ui_vg_animation_state_get(anim_view);
325
326 switch (state)
327 {
328 case EFL_UI_VG_ANIMATION_STATE_NOT_READY:
329 efl_text_set(label, "State = Not Ready");
330 break;
331 case EFL_UI_VG_ANIMATION_STATE_PLAYING:
332 efl_text_set(label, "State = Playing");
333 break;
334 case EFL_UI_VG_ANIMATION_STATE_PLAYING_BACKWARDS:
335 efl_text_set(label, "State = Playing Backwards");
336
337 break;
338 case EFL_UI_VG_ANIMATION_STATE_PAUSED:
339 efl_text_set(label, "State = Paused");
340 break;
341 case EFL_UI_VG_ANIMATION_STATE_STOPPED:
342 efl_text_set(label, "State = Stopped");
343 break;
344 }
345}
346
347static void
348_animation_playing_changed_cb(void *data, const Efl_Event *event)
349{
350 Eina_Bool playing = *(Eina_Bool*)event->info;
351 App_Data *ad = data;
352 update_anim_view_state(event->object, ad->label);
353 //Stopped
354 if (!playing)
355 efl_ui_range_value_set(ad->slider, 0);
356}
357
358static void
359_animation_paused_changed_cb(void *data, const Efl_Event *event)
360{
361 App_Data *ad = data;
362 update_anim_view_state(event->object, ad->label);
363}
364
365static void
366_animation_playback_progress_changed_cb(void *data, const Efl_Event *event)
367{
368 double progress = *(double*)event->info;
369 App_Data *ad = data;
370 efl_ui_range_value_set(ad->slider, progress);
371}
372
373static void
374_animation_playback_repeated_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
375{
376 int repeated_times = *(int*)event->info;
377 printf("repeated! (times: %d)\n", repeated_times);
378}
379
380static void
381_animation_playback_finished_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
382{
383 printf("done!\n");
384}
385
386EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
387 {EFL_PLAYER_EVENT_PLAYING_CHANGED, _animation_playing_changed_cb },
388 {EFL_PLAYER_EVENT_PAUSED_CHANGED, _animation_paused_changed_cb },
389 {EFL_PLAYER_EVENT_PLAYBACK_PROGRESS_CHANGED, _animation_playback_progress_changed_cb },
390 {EFL_PLAYER_EVENT_PLAYBACK_REPEATED, _animation_playback_repeated_changed_cb },
391 {EFL_PLAYER_EVENT_PLAYBACK_FINISHED, _animation_playback_finished_changed_cb },
392)
393
394static void
395_win_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
396{
397 App_Data *ad = data;
398 free(ad);
399}
400
294void 401void
295test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 402test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
296{ 403{
297 Eo *win, *box, *box_sub, *label, *check, *slider, *list; 404 Eo *win, *box, *box_sub, *label, *check, *slider, *list;
298 char buf[255]; 405 char buf[255];
406 App_Data *ad = calloc(1, sizeof(App_Data));
407 if (!ad) return;
408
299 // This line must to need. 409 // This line must to need.
300 setenv("ELM_ACCEL", "gl", 1); 410 setenv("ELM_ACCEL", "gl", 1);
301 411
302 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 412 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
303 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), 413 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
304 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"), 414 efl_text_set(efl_added, "Efl_Ui_Vg_Animation demo"),
305 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 415 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
416 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del_cb, ad));
306 417
307 // Create a box in Canvas 418 // Create a box in Canvas
308 box = efl_add(EFL_UI_BOX_CLASS, win, 419 box = efl_add(EFL_UI_BOX_CLASS, win,
@@ -310,14 +421,14 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
310 efl_content_set(win, efl_added)); 421 efl_content_set(win, efl_added));
311 422
312 //Create a label to show state of animation 423 //Create a label to show state of animation
313 label = efl_add(EFL_UI_TEXT_CLASS, win, 424 label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
314 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 425 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
315 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 426 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
316 efl_pack(box, efl_added)); 427 efl_pack(box, efl_added));
317 428
318 //Create Animation View to play animation directly from JSON file 429 //Create Animation View to play animation directly from JSON file
319 snprintf(buf, sizeof(buf), "%s/images/three_box.json", elm_app_data_dir_get()); 430 snprintf(buf, sizeof(buf), "%s/images/three_box.json", elm_app_data_dir_get());
320 anim_view = efl_add(EFL_UI_ANIMATION_VIEW_CLASS, win, 431 anim_view = efl_add(EFL_UI_VG_ANIMATION_CLASS, win,
321 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), 432 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
322 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 433 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
323 efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(600, 600)), 434 efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(600, 600)),
@@ -329,7 +440,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
329 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 440 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
330 efl_pack(box, efl_added)); 441 efl_pack(box, efl_added));
331 //Path 442 //Path
332 efl_add(EFL_UI_TEXT_CLASS, box_sub, 443 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
333 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 444 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
334 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 445 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
335 efl_text_set(efl_added, "Path examples : three_box.json\n" 446 efl_text_set(efl_added, "Path examples : three_box.json\n"
@@ -346,7 +457,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
346 efl_text_multiline_set(efl_added, EINA_TRUE), 457 efl_text_multiline_set(efl_added, EINA_TRUE),
347 efl_pack(box_sub, efl_added)); 458 efl_pack(box_sub, efl_added));
348 459
349 efl_add(EFL_UI_TEXT_CLASS, box_sub, 460 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
350 efl_gfx_hint_weight_set(efl_added, 0, 0), 461 efl_gfx_hint_weight_set(efl_added, 0, 0),
351 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 462 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
352 efl_text_set(efl_added, "[Value Provider]"), 463 efl_text_set(efl_added, "[Value Provider]"),
@@ -361,7 +472,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
361 efl_pack(box, efl_added)); 472 efl_pack(box, efl_added));
362 473
363 //Path 474 //Path
364 efl_add(EFL_UI_TEXT_CLASS, box_sub, 475 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
365 efl_gfx_hint_weight_set(efl_added, 0, 0), 476 efl_gfx_hint_weight_set(efl_added, 0, 0),
366 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 477 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
367 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 478 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -369,7 +480,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
369 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 480 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
370 efl_pack(box_sub, efl_added)); 481 efl_pack(box_sub, efl_added));
371 482
372 path_entry = efl_add(EFL_UI_TEXT_CLASS, box_sub, 483 path_entry = efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
373 efl_gfx_hint_weight_set(efl_added, 0.1, 0), 484 efl_gfx_hint_weight_set(efl_added, 0.1, 0),
374 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 485 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
375 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 486 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -378,7 +489,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
378 efl_gfx_hint_size_min_set(path_entry, EINA_SIZE2D(200, 10)); 489 efl_gfx_hint_size_min_set(path_entry, EINA_SIZE2D(200, 10));
379 efl_text_set(efl_part(path_entry, "efl.text_guide"), "Enter path(ex: ** or Layer.Shape.Fill) "); 490 efl_text_set(efl_part(path_entry, "efl.text_guide"), "Enter path(ex: ** or Layer.Shape.Fill) ");
380 491
381 efl_add(EFL_UI_TEXT_CLASS, box_sub, 492 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
382 efl_gfx_hint_weight_set(efl_added, 0, 0), 493 efl_gfx_hint_weight_set(efl_added, 0, 0),
383 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 494 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
384 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 495 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -394,11 +505,14 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
394 elm_hoversel_item_add(type_hoversel, "FillColor", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub); 505 elm_hoversel_item_add(type_hoversel, "FillColor", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub);
395 elm_hoversel_item_add(type_hoversel, "StrokeColor", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub); 506 elm_hoversel_item_add(type_hoversel, "StrokeColor", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub);
396 elm_hoversel_item_add(type_hoversel, "StrokeWidth", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub); 507 elm_hoversel_item_add(type_hoversel, "StrokeWidth", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub);
508 elm_hoversel_item_add(type_hoversel, "TrPosition", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub);
509 elm_hoversel_item_add(type_hoversel, "TrScale", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub);
510 elm_hoversel_item_add(type_hoversel, "TrRotation", NULL, ELM_ICON_NONE, _hover_item_selected_cb, box_sub);
397 evas_object_show(type_hoversel); 511 evas_object_show(type_hoversel);
398 elm_object_focus_set(type_hoversel, EINA_TRUE); 512 elm_object_focus_set(type_hoversel, EINA_TRUE);
399 efl_pack(box_sub, type_hoversel); 513 efl_pack(box_sub, type_hoversel);
400 514
401 efl_add(EFL_UI_TEXT_CLASS, box_sub, 515 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
402 efl_gfx_hint_weight_set(efl_added, 0, 0), 516 efl_gfx_hint_weight_set(efl_added, 0, 0),
403 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 517 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
404 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 518 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -478,8 +592,8 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
478 592
479 593
480 //Duration Text 594 //Duration Text
481 snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view)); 595 snprintf(buf, sizeof(buf), "Duration(Length): %1.2fs", efl_playable_length_get(anim_view));
482 efl_add(EFL_UI_TEXT_CLASS, box_sub, 596 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
483 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 597 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
484 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 598 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
485 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 599 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -514,7 +628,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
514 efl_add(EFL_UI_BUTTON_CLASS, box_sub, 628 efl_add(EFL_UI_BUTTON_CLASS, box_sub,
515 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 629 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
516 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 630 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
517 efl_text_set(efl_added, "Play Back"), 631 efl_text_set(efl_added, "Play Backwards"),
518 efl_pack(box_sub, efl_added), 632 efl_pack(box_sub, efl_added),
519 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, btn_clicked_cb, anim_view)); 633 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, btn_clicked_cb, anim_view));
520 634
@@ -549,16 +663,10 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
549 efl_pack(box_sub, efl_added), 663 efl_pack(box_sub, efl_added),
550 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, btn_clicked_cb, anim_view)); 664 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, btn_clicked_cb, anim_view));