summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-configure.sh6
-rwxr-xr-x.ci/ci-make-check.sh16
-rwxr-xr-x.ci/ci-make.sh3
-rwxr-xr-x.ci/ci-setup-ccache.sh3
-rwxr-xr-x.ci/docker-ccache-setup.sh6
-rw-r--r--.gitignore1
-rw-r--r--.lgtm.yml7
-rw-r--r--.travis.yml20
-rw-r--r--AUTHORS40
-rw-r--r--COPYING2
-rw-r--r--README1
-rw-r--r--data/elementary/themes/edc/elm/scroller.edc177
-rw-r--r--data/elementary/themes/edc/pointer.edc3
-rwxr-xr-xdoc/efl_copy.sh1
-rw-r--r--doc/meson.build12
-rw-r--r--licenses/COPYING.ASL202
-rw-r--r--meson.build10
-rw-r--r--meson_options.txt12
-rw-r--r--po/hu.po8
-rw-r--r--src/bin/edje/edje_player.c2
-rw-r--r--src/bin/edje/meson.build2
-rw-r--r--src/bin/efl_mono_msbuild_gen/main.cc15
-rw-r--r--src/bin/efreet/efreet_desktop_cache_create.c21
-rw-r--r--src/bin/elementary/meson.build2
-rw-r--r--src/bin/elementary/test.c6
-rw-r--r--src/bin/elementary/test_efl_anim_alpha.c45
-rw-r--r--src/bin/elementary/test_efl_anim_group_parallel.c56
-rw-r--r--src/bin/elementary/test_efl_anim_group_sequential.c55
-rw-r--r--src/bin/elementary/test_efl_anim_interpolator.c99
-rw-r--r--src/bin/elementary/test_efl_anim_pause.c68
-rw-r--r--src/bin/elementary/test_efl_anim_repeat.c74
-rw-r--r--src/bin/elementary/test_efl_anim_rotate.c85
-rw-r--r--src/bin/elementary/test_efl_anim_scale.c84
-rw-r--r--src/bin/elementary/test_efl_anim_start_delay.c55
-rw-r--r--src/bin/elementary/test_efl_anim_translate.c65
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/elementary/test_label.c24
-rw-r--r--src/bin/elementary/test_ui_relative_container.c (renamed from src/bin/elementary/test_ui_relative_layout.c)50
-rw-r--r--src/bin/elementary/test_ui_spotlight.c4
-rw-r--r--src/bin/eolian/headers.c2
-rw-r--r--src/bin/eolian_cxx/eolian_cxx.cc15
-rw-r--r--src/bin/eolian_mono/eolian/mono/alias_definition.hh91
-rw-r--r--src/bin/eolian_mono/eolian/mono/async_function_definition.hh21
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh21
-rw-r--r--src/bin/eolian_mono/eolian/mono/documentation.hh17
-rw-r--r--src/bin/eolian_mono/eolian/mono/enum_definition.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/events.hh55
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_declaration.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_definition.hh28
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_helpers.hh20
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_pointer.hh48
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_registration.hh17
-rw-r--r--src/bin/eolian_mono/eolian/mono/generation_contexts.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/helpers.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/klass.hh41
-rw-r--r--src/bin/eolian_mono/eolian/mono/logging.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_annotation.hh19
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_type.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/name_helpers.hh61
-rw-r--r--src/bin/eolian_mono/eolian/mono/parameter.hh21
-rw-r--r--src/bin/eolian_mono/eolian/mono/part_definition.hh17
-rw-r--r--src/bin/eolian_mono/eolian/mono/struct_definition.hh151
-rw-r--r--src/bin/eolian_mono/eolian/mono/struct_fields.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/type.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/type_impl.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/using_decl.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/utils.hh15
-rw-r--r--src/bin/eolian_mono/eolian/mono/variable_definition.hh15
-rw-r--r--src/bin/eolian_mono/eolian_mono.cc37
-rw-r--r--src/bindings/cxx/ecore_cxx/Ecore.hh15
-rw-r--r--src/bindings/cxx/ecore_cxx/Ecore_Manual.hh15
-rw-r--r--src/bindings/cxx/eet_cxx/Eet.hh15
-rw-r--r--src/bindings/cxx/eet_cxx/eet_composite.hh15
-rw-r--r--src/bindings/cxx/eet_cxx/eet_register.hh15
-rw-r--r--src/bindings/cxx/eet_cxx/eet_type.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/Eina.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_accessor.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_aligned_union.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_array.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_clone_allocators.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_copy_traits.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_deleter.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_error.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_fold.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_function.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_future.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_inarray.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_inlist.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_integer_sequence.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_iterator.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_list.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_log.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_logical.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_optional.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_pp.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_ptrarray.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_ptrlist.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_range_types.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_ref.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_strbuf.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_string_view.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_stringshare.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_thread.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_throw.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_tuple.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_tuple_c.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_type_traits.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_value.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_variant.hh15
-rw-r--r--src/bindings/cxx/eina_cxx/eina_workarounds.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/Eldbus.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/Eldbus_Model.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_basic.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_error.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_message.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_service.hh15
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/Eo.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/efl_object_impl.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_concrete.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_cxx_interop.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_event.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_init.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_ops.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_private.hh15
-rw-r--r--src/bindings/cxx/eo_cxx/eo_wref.hh15
-rw-r--r--src/bindings/mono/efl_mono.dll.config.in15
-rw-r--r--src/bindings/mono/efl_mono/AssemblyInfo.cs.in3
-rw-r--r--src/bindings/mono/efl_mono/GenericModel.cs6
-rw-r--r--src/bindings/mono/efl_mono/ItemFactory.cs7
-rw-r--r--src/bindings/mono/efl_mono/UserModel.cs19
-rw-r--r--src/bindings/mono/efl_mono/efl_all.cs15
-rw-r--r--src/bindings/mono/efl_mono/efl_csharp_application.cs23
-rw-r--r--src/bindings/mono/efl_mono/efl_libs.cs.in15
-rw-r--r--src/bindings/mono/efl_mono/efl_libs.csv.in15
-rw-r--r--src/bindings/mono/efl_mono/meson.build23
-rw-r--r--src/bindings/mono/efl_sharp.csproj.in44
-rw-r--r--src/bindings/mono/eina_mono/eina_accessor.cs16
-rw-r--r--src/bindings/mono/eina_mono/eina_array.cs19
-rw-r--r--src/bindings/mono/eina_mono/eina_binbuf.cs15
-rw-r--r--src/bindings/mono/eina_mono/eina_common.cs21
-rw-r--r--src/bindings/mono/eina_mono/eina_config.cs15
-rw-r--r--src/bindings/mono/eina_mono/eina_container_common.cs116
-rw-r--r--src/bindings/mono/eina_mono/eina_environment.cs53
-rw-r--r--src/bindings/mono/eina_mono/eina_error.cs145
-rw-r--r--src/bindings/mono/eina_mono/eina_hash.cs63
-rw-r--r--src/bindings/mono/eina_mono/eina_inarray.cs15
-rw-r--r--src/bindings/mono/eina_mono/eina_inlist.cs15
-rw-r--r--src/bindings/mono/eina_mono/eina_iterator.cs15
-rw-r--r--src/bindings/mono/eina_mono/eina_list.cs15
-rw-r--r--src/bindings/mono/eina_mono/eina_log.cs19
-rw-r--r--src/bindings/mono/eina_mono/eina_promises.cs19
-rw-r--r--src/bindings/mono/eina_mono/eina_slice.cs105
-rw-r--r--src/bindings/mono/eina_mono/eina_strbuf.cs20
-rw-r--r--src/bindings/mono/eina_mono/eina_stringshare.cs26
-rw-r--r--src/bindings/mono/eina_mono/eina_value.cs605
-rw-r--r--src/bindings/mono/eina_mono/meson.build3
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_common.cs406
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_config.cs15
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_connection.cs15
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_message.cs15
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_object.cs16
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_pending.cs15
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_proxy.cs32
-rw-r--r--src/bindings/mono/eldbus_mono/eldbus_service.cs15
-rw-r--r--src/bindings/mono/eo_mono/EoWrapper.cs203
-rw-r--r--src/bindings/mono/eo_mono/FunctionWrapper.cs139
-rw-r--r--src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs36
-rw-r--r--src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs26
-rw-r--r--src/bindings/mono/eo_mono/NativeModule.cs60
-rw-r--r--src/bindings/mono/eo_mono/NativeModule_Unix.cs28
-rw-r--r--src/bindings/mono/eo_mono/NativeModule_Windows.cs26
-rw-r--r--src/bindings/mono/eo_mono/WrapperSupervisor.cs34
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs466
-rw-r--r--src/bindings/mono/eo_mono/workaround.cs262
-rw-r--r--src/bindings/mono/meson.build117
-rw-r--r--src/examples/ecore/ecore_evas_ews_example.c2
-rw-r--r--src/examples/ecore/efl_exe.c2
-rw-r--r--src/examples/ecore/efl_mono_loop_timer_example.cs15
-rw-r--r--src/examples/ecore/efl_thread.c6
-rw-r--r--src/examples/efl_mono/EoInherit01.cs15
-rw-r--r--src/examples/efl_mono/FunctionPointer01.cs15
-rw-r--r--src/examples/efl_mono/example_numberwrapper.c15
-rw-r--r--src/examples/eina/EinaArray01.cs15
-rw-r--r--src/examples/eina/EinaBinbuf01.cs15
-rw-r--r--src/examples/eina/EinaError01.cs15
-rw-r--r--src/examples/eina/EinaHash01.cs15
-rw-r--r--src/examples/eina_cxx/eina_cxx_list_01.cc15
-rw-r--r--src/examples/eina_cxx/eina_cxx_thread_01.cc15
-rw-r--r--src/examples/elementary/.gitignore4
-rw-r--r--src/examples/elementary/bg_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/bg_cxx_example_02.cc15
-rw-r--r--src/examples/elementary/box_cxx_example_02.cc15
-rw-r--r--src/examples/elementary/button_cxx_example_00.cc15
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/calendar_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/calendar_cxx_example_02.cc15
-rw-r--r--src/examples/elementary/calendar_cxx_example_03.cc15
-rw-r--r--src/examples/elementary/calendar_cxx_example_04.cc15
-rw-r--r--src/examples/elementary/calendar_cxx_example_05.cc15
-rw-r--r--src/examples/elementary/clock_cxx_example.cc15
-rw-r--r--src/examples/elementary/efl_ui_relative_container_example_01.c (renamed from src/examples/elementary/efl_ui_relative_layout_example_01.c)18
-rw-r--r--src/examples/elementary/efl_ui_relative_container_example_02.c (renamed from src/examples/elementary/efl_ui_relative_layout_example_02.c)14
-rw-r--r--src/examples/elementary/efl_ui_slider_mono.cs15
-rw-r--r--src/examples/elementary/efl_ui_unit_converter.cs15
-rw-r--r--src/examples/elementary/icon_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/menu_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/popup_cxx_example.cc15
-rw-r--r--src/examples/elementary/radio_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/slider_cxx_example.cc15
-rw-r--r--src/examples/elementary/spinner_cxx_example.cc15
-rw-r--r--src/examples/elementary/table_cxx_example_01.cc15
-rw-r--r--src/examples/elementary/table_cxx_example_02.cc15
-rw-r--r--src/examples/elementary/toolbar_cxx_example_01.cc15
-rw-r--r--src/examples/eolian_cxx/colourable_cxx.cc15
-rw-r--r--src/examples/eolian_cxx/colourablesquare_cxx.cc15
-rw-r--r--src/examples/eolian_cxx/eolian_cxx_callbacks_01.cc15
-rw-r--r--src/examples/eolian_cxx/eolian_cxx_simple_01.cc15
-rw-r--r--src/examples/eolian_cxx/eolian_cxx_simple_01_cxx_impl.cc15
-rw-r--r--src/examples/evas/efl-canvas-animation.c179
-rw-r--r--src/examples/evas/evas-vg-json.c12
-rw-r--r--src/examples/evas/evas_cxx_rectangle.cc15
-rw-r--r--src/examples/evas/meson.build1
-rw-r--r--src/lib/ecore/ecore_app.c6
-rw-r--r--src/lib/ecore/ecore_events.c150
-rw-r--r--src/lib/ecore/ecore_private.h15
-rw-r--r--src/lib/ecore/ecore_timer.c67
-rw-r--r--src/lib/ecore/efl_accelerate_interpolator.c16
-rw-r--r--src/lib/ecore/efl_accelerate_interpolator.eo14
-rw-r--r--src/lib/ecore/efl_boolean_model.c10
-rw-r--r--src/lib/ecore/efl_boolean_model.eo4
-rw-r--r--src/lib/ecore/efl_bounce_interpolator.c40
-rw-r--r--src/lib/ecore/efl_bounce_interpolator.eo24
-rw-r--r--src/lib/ecore/efl_composite_model.c2
-rw-r--r--src/lib/ecore/efl_cubic_bezier_interpolator.c50
-rw-r--r--src/lib/ecore/efl_cubic_bezier_interpolator.eo26
-rw-r--r--src/lib/ecore/efl_decelerate_interpolator.c16
-rw-r--r--src/lib/ecore/efl_decelerate_interpolator.eo14
-rw-r--r--src/lib/ecore/efl_divisor_interpolator.c39
-rw-r--r--src/lib/ecore/efl_divisor_interpolator.eo20
-rw-r--r--src/lib/ecore/efl_linear_interpolator.eo3
-rw-r--r--src/lib/ecore/efl_loop.c22
-rw-r--r--src/lib/ecore/efl_loop_message_handler.c12
-rw-r--r--src/lib/ecore/efl_loop_timer.eo4
-rw-r--r--src/lib/ecore/efl_sinusoidal_interpolator.c16
-rw-r--r--src/lib/ecore/efl_sinusoidal_interpolator.eo13
-rw-r--r--src/lib/ecore/efl_spring_interpolator.c44
-rw-r--r--src/lib/ecore/efl_spring_interpolator.eo24
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_device.c2
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_outputs.c4
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/ecore_evas/ecore_evas_drm.h1
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c1
-rw-r--r--src/lib/ecore_file/Ecore_File.h8
-rw-r--r--src/lib/ecore_input_evas/ecore_input_evas_private.h4
-rw-r--r--src/lib/ecore_wl2/Ecore_Wl2.h94
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c44
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_internal.h31
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h6
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c22
-rw-r--r--src/lib/ecore_x/Ecore_X.h11
-rw-r--r--src/lib/ecore_x/Ecore_X_Atoms.h2
-rw-r--r--src/lib/ecore_x/ecore_x.c4
-rw-r--r--src/lib/ecore_x/ecore_x_atoms_decl.h4
-rw-r--r--src/lib/ecore_x/ecore_x_xi2.c179
-rw-r--r--src/lib/edje/Efl_Layout.h3
-rw-r--r--src/lib/edje/edje_box_layout.c5
-rw-r--r--src/lib/edje/edje_cache.c37
-rw-r--r--src/lib/edje/edje_calc.c101
-rw-r--r--src/lib/edje/edje_callbacks.c3
-rw-r--r--src/lib/edje/edje_legacy.c2
-rw-r--r--src/lib/edje/edje_load.c50
-rw-r--r--src/lib/edje/edje_private.h21
-rw-r--r--src/lib/edje/edje_program.c19
-rw-r--r--src/lib/edje/edje_smart.c8
-rw-r--r--src/lib/edje/edje_textblock.c145
-rw-r--r--src/lib/edje/edje_textblock_styles.c10
-rw-r--r--src/lib/edje/edje_util.c3
-rw-r--r--src/lib/edje/efl_canvas_layout.eo2
-rw-r--r--src/lib/edje/efl_canvas_layout_eo.legacy.c4
-rw-r--r--src/lib/efl/Efl.h7
-rw-r--r--src/lib/efl/interfaces/efl_cached_item.eo17
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h169
-rw-r--r--src/lib/efl/interfaces/efl_gfx_arrangement.eo13
-rw-r--r--src/lib/efl/interfaces/efl_gfx_frame_controller.eo19
-rw-r--r--src/lib/efl/interfaces/efl_gfx_hint.eo16
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo8
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot11
-rw-r--r--src/lib/efl/interfaces/efl_gfx_view.eo5
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_interpolator.eo21
-rw-r--r--src/lib/efl/interfaces/efl_ui_factory.eo21
-rw-r--r--src/lib/efl/interfaces/efl_ui_scrollable.eo104
-rw-r--r--src/lib/efl/interfaces/meson.build9
-rw-r--r--src/lib/efl_mono/efl_custom_exports_mono.c26
-rw-r--r--src/lib/efreet/efreet_cache.c2
-rw-r--r--src/lib/efreet/efreet_desktop.c12
-rw-r--r--src/lib/efreet/efreet_desktop_command.c15
-rw-r--r--src/lib/eina/eina_config.h.in116
-rw-r--r--src/lib/eina/eina_inline_mempool.x14
-rw-r--r--src/lib/eina/eina_list.c12
-rw-r--r--src/lib/eina/eina_matrix.c10
-rw-r--r--src/lib/eina/eina_mempool.c3
-rw-r--r--src/lib/eina/eina_mempool.h23
-rw-r--r--src/lib/eina/eina_rectangle.h21
-rw-r--r--src/lib/eina/eina_value.c2
-rw-r--r--src/lib/eina/eina_vector.h1
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c20
-rw-r--r--src/lib/elementary/Efl_Ui.h8
-rw-r--r--src/lib/elementary/efl_ui.eot16
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.c38
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.eo3
-rw-r--r--src/lib/elementary/efl_ui_alert_popup_part_title.eo (renamed from src/lib/elementary/efl_ui_alert_popup_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_animation_view.c31
-rw-r--r--src/lib/elementary/efl_ui_animation_view.eo19
-rw-r--r--src/lib/elementary/efl_ui_caching_factory.c4
-rw-r--r--src/lib/elementary/efl_ui_caching_factory.eo7
-rw-r--r--src/lib/elementary/efl_ui_check.c3
-rw-r--r--src/lib/elementary/efl_ui_collection_view.c141
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.c16
-rw-r--r--src/lib/elementary/efl_ui_position_manager_list.c31
-rw-r--r--src/lib/elementary/efl_ui_relative_container.c (renamed from src/lib/elementary/efl_ui_relative_layout.c)198
-rw-r--r--src/lib/elementary/efl_ui_relative_container.eo94
-rw-r--r--src/lib/elementary/efl_ui_relative_container_private.h (renamed from src/lib/elementary/efl_ui_relative_layout_private.h)68
-rw-r--r--src/lib/elementary/efl_ui_relative_layout.eo73
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.eo12
-rw-r--r--src/lib/elementary/efl_ui_selection_manager.c5
-rw-r--r--src/lib/elementary/efl_ui_slider.c48
-rw-r--r--src/lib/elementary/efl_ui_spotlight_container.c4
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager.eo8
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_plain.c10
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_plain.eo2
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_scroll.c6
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_scroll.eo2
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_stack.c166
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_stack.eo2
-rw-r--r--src/lib/elementary/efl_ui_table_static.eo8
-rw-r--r--src/lib/elementary/efl_ui_text.c48
-rw-r--r--src/lib/elementary/efl_ui_text.eo118
-rw-r--r--src/lib/elementary/efl_ui_widget.c8
-rw-r--r--src/lib/elementary/efl_ui_win.c4
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elm_code_file.c11
-rw-r--r--src/lib/elementary/elm_config.c27
-rw-r--r--src/lib/elementary/elm_entry.c1
-rw-r--r--src/lib/elementary/elm_general.eot1
-rw-r--r--src/lib/elementary/elm_gengrid.c1
-rw-r--r--src/lib/elementary/elm_genlist.c172
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c61
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo3
-rw-r--r--src/lib/elementary/elm_list.c3
-rw-r--r--src/lib/elementary/elm_map.c3
-rw-r--r--src/lib/elementary/elm_panel.c1
-rw-r--r--src/lib/elementary/elm_priv.h4
-rw-r--r--src/lib/elementary/elm_scroller.c1
-rw-r--r--src/lib/elementary/elm_slider.c58
-rw-r--r--src/lib/elementary/elm_toolbar.c1
-rw-r--r--src/lib/elementary/elm_widget_genlist.h3
-rw-r--r--src/lib/elementary/meson.build8
-rw-r--r--src/lib/emotion/emotion_smart.c1
-rw-r--r--src/lib/eo/Eo.h50
-rw-r--r--src/lib/eo/eo.c1
-rw-r--r--src/lib/eo/eo_base_class.c489
-rw-r--r--src/lib/eolian/eolian_database.c1
-rw-r--r--src/lib/eolian_cxx/Eolian_Cxx.hh15
-rw-r--r--src/lib/eolian_cxx/grammar/address_of.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/alternative.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/attribute_conditional.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/attribute_reorder.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/attribute_replace.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/attributes.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/base_class_definition.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/blacklist.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/c_type.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/case.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/class_declaration.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/class_definition.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/class_implementation.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/container.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/context.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/converting_argument.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/eps.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/function_declaration.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/function_definition.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/generator.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/header.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/header_guards.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/header_include_directive.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/html_escaped_string.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/ignore_warning.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/impl_header.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/implementation_include_directive.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/indentation.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/integral.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/keyword.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/klass_def.hpp100
-rw-r--r--src/lib/eolian_cxx/grammar/kleene.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/list.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/meta.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/namespace.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/parameter.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/part_declaration.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/part_implementation.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/qualifier_def.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/sequence.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/string.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/type.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/type_function_declaration.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/type_impl.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/type_traits.hpp15
-rw-r--r--src/lib/eolian_cxx/grammar/types_definition.hpp15
-rw-r--r--src/lib/evas/Efl_Canvas.h16
-rw-r--r--src/lib/evas/Evas.h2
-rw-r--r--src/lib/evas/Evas_Common.h24
-rw-r--r--src/lib/evas/Evas_Eo.h26
-rw-r--r--src/lib/evas/Evas_Internal.h159
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.c11
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.eo78
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_alpha.eo15
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group.eo19
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo9
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo10
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c444
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.eo62
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player_private.h53
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate.c44
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate.eo44
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate_private.h9
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.c134
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.eo49
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale_private.h18
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.c75
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.eo32
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate_private.h10
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_types.eot3
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_object_animation.c197
-rw-r--r--src/lib/evas/canvas/efl_canvas_object_animation.eo60
-rw-r--r--src/lib/evas/canvas/efl_canvas_pointer.eo (renamed from src/lib/efl/interfaces/efl_canvas_pointer.eo)0
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene.eo (renamed from src/lib/efl/interfaces/efl_canvas_scene.eo)0
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container.c5
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c43
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.eo1
-rw-r--r--src/lib/evas/canvas/efl_input_device.c (renamed from src/lib/efl/interfaces/efl_input_device.c)108
-rw-r--r--src/lib/evas/canvas/efl_input_device.eo (renamed from src/lib/efl/interfaces/efl_input_device.eo)0
-rw-r--r--src/lib/evas/canvas/efl_input_event.c4
-rw-r--r--src/lib/evas/canvas/efl_input_focus.c5
-rw-r--r--src/lib/evas/canvas/efl_input_hold.c3
-rw-r--r--src/lib/evas/canvas/efl_input_key.c3
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c3
-rw-r--r--src/lib/evas/canvas/efl_input_types.eot (renamed from src/lib/efl/interfaces/efl_input_types.eot)0
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c3
-rw-r--r--src/lib/evas/canvas/evas_device.c100
-rw-r--r--src/lib/evas/canvas/evas_events.c3
-rw-r--r--src/lib/evas/canvas/evas_events_legacy.c3
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c7
-rw-r--r--src/lib/evas/canvas/evas_image_private.h5
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c3
-rw-r--r--src/lib/evas/canvas/evas_main.c5
-rw-r--r--src/lib/evas/canvas/evas_object_main.c106
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h3
-rw-r--r--src/lib/evas/canvas/meson.build13
-rw-r--r--src/lib/evas/common/evas_common_generic_cache.c2
-rw-r--r--src/lib/evas/common/evas_font.h53
-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.c54
-rw-r--r--src/lib/evas/common/evas_text_utils.c6
-rw-r--r--src/lib/evas/file/evas_module.c25
-rw-r--r--src/lib/evas/filters/evas_filter.c22
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c39
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h2
-rw-r--r--src/lib/evas/include/evas_common_private.h1
-rw-r--r--src/lib/evas/include/evas_filter.h12
-rw-r--r--src/lib/evas/include/evas_private.h16
-rw-r--r--src/lib/evas/meson.build166
-rw-r--r--src/lib/evas/software_generic/filters/meson.build1
-rw-r--r--src/lib/evas/vg/evas_vg_cache.c128
-rw-r--r--src/lib/evas_goal/empty.c0
-rw-r--r--src/lib/evas_goal/meson.build179
-rw-r--r--src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c1
-rw-r--r--src/modules/eina/mp/chained_pool/eina_chained_mempool.c74
-rw-r--r--src/modules/eina/mp/one_big/eina_one_big.c3
-rw-r--r--src/modules/eina/mp/pass_through/eina_pass_through.c1
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c93
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_shader.c7
-rw-r--r--src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x7
-rw-r--r--src/modules/evas/engines/gl_common/shader/fragment.glsl8
-rw-r--r--src/modules/evas/engines/gl_drm/evas_outbuf.c2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c1
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h1
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_inverse_color.c53
-rw-r--r--src/modules/evas/engines/gl_generic/meson.build1
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c1
-rw-r--r--src/modules/evas/engines/software_generic/filters/evas_engine_filter.h1
-rw-r--r--src/modules/evas/engines/software_generic/filters/evas_filter_inverse_color.c57
-rw-r--r--src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h8
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c2
-rw-r--r--src/modules/evas/image_loaders/meson.build23
-rw-r--r--src/modules/evas/image_savers/meson.build23
-rw-r--r--src/modules/evas/meson.build4
-rw-r--r--src/modules/evas/model_loaders/meson.build17
-rw-r--r--src/modules/evas/model_savers/meson.build17
-rw-r--r--src/modules/evas/vg_loaders/json/evas_vg_load_json.c25
-rw-r--r--src/modules/evas/vg_loaders/meson.build27
-rw-r--r--src/modules/evas/vg_savers/eet/evas_vg_save_eet.c2
-rw-r--r--src/modules/evas/vg_savers/meson.build18
-rw-r--r--src/static_libs/buildsystem/buildsystem_meson.c4
-rw-r--r--src/static_libs/vg_common/vg_common_svg.c24
-rw-r--r--src/tests/ecore/ecore_suite.c3
-rw-r--r--src/tests/ecore/ecore_test_ecore.c7
-rw-r--r--src/tests/ecore/ecore_test_ecore_file.c47
-rw-r--r--src/tests/ecore/ecore_test_timer.c130
-rw-r--r--src/tests/ecore/efl_app_test_loop_timer.c184
-rw-r--r--src/tests/ecore_audio_cxx/cxx_compile_test.cc15
-rw-r--r--src/tests/ecore_cxx/cxx_compile_test.cc15
-rw-r--r--src/tests/ecore_cxx/ecore_cxx_suite.cc15
-rw-r--r--src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc15
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_suite.c1
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_suite.h1
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_display.c14
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_surface.c56
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_window.c213
-rw-r--r--src/tests/ecore_wl2/meson.build3
-rw-r--r--src/tests/edje_cxx/cxx_compile_test.cc15
-rw-r--r--src/tests/eet_cxx/eet_cxx_suite.cc15
-rw-r--r--src/tests/eet_cxx/eet_cxx_test_descriptors.cc15
-rw-r--r--src/tests/efl/efl_test_composite_model.c126
-rw-r--r--src/tests/efl/efl_test_container_model.c1
-rw-r--r--src/tests/efl_mono/BasicDirection.cs16
-rw-r--r--src/tests/efl_mono/Eina.cs398
-rw-r--r--src/tests/efl_mono/EinaTestData.cs64
-rw-r--r--src/tests/efl_mono/Eldbus.cs17
-rw-r--r--src/tests/efl_mono/Eo.cs99
-rw-r--r--src/tests/efl_mono/EoConstruction.cs15
-rw-r--r--src/tests/efl_mono/EoPromises.cs23
-rw-r--r--src/tests/efl_mono/Errors.cs28
-rw-r--r--src/tests/efl_mono/Events.cs37
-rw-r--r--src/tests/efl_mono/FunctionPointerMarshalling.cs18
-rw-r--r--src/tests/efl_mono/FunctionPointers.cs22
-rw-r--r--src/tests/efl_mono/Hash.cs3
-rw-r--r--src/tests/efl_mono/Inheritance.cs25
-rw-r--r--src/tests/efl_mono/Main.cs29
-rw-r--r--src/tests/efl_mono/Model.cs15
-rw-r--r--src/tests/efl_mono/Parts.cs37
-rw-r--r--src/tests/efl_mono/Promises.cs39
-rw-r--r--src/tests/efl_mono/Strbuf.cs21
-rw-r--r--src/tests/efl_mono/Strings.cs46
-rw-r--r--src/tests/efl_mono/StructHelpers.cs15
-rw-r--r--src/tests/efl_mono/Structs.cs68
-rw-r--r--src/tests/efl_mono/TestUtils.cs15
-rw-r--r--src/tests/efl_mono/Value.cs115
-rw-r--r--src/tests/efl_mono/ValueEolian.cs34
-rw-r--r--src/tests/efl_mono/dummy_child.c15
-rw-r--r--src/tests/efl_mono/dummy_constructible_object.c15
-rw-r--r--src/tests/efl_mono/dummy_event_manager.c15
-rw-r--r--src/tests/efl_mono/dummy_inherit_helper.c15
-rw-r--r--src/tests/efl_mono/dummy_interfaces.c15
-rw-r--r--src/tests/efl_mono/dummy_numberwrapper.c15
-rw-r--r--src/tests/efl_mono/dummy_part_holder.c15
-rw-r--r--src/tests/efl_mono/dummy_test_object.c27
-rw-r--r--src/tests/efl_mono/efl_sharp_test_suite.csproj.in36
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.h15
-rw-r--r--src/tests/efl_mono/meson.build148
-rw-r--r--src/tests/eina/eina_test_log.c4
-rw-r--r--src/tests/eina/eina_test_matrix.c14
-rw-r--r--src/tests/eina/eina_test_slstr.c2
-rw-r--r--src/tests/eina_cxx/eina_cxx_suite.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_accessor.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_error.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_inarray.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_inlist.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_iterator.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_log.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_optional.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_ptrarray.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_ptrlist.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_stringshare.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_thread.cc15
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_value.cc15
-rw-r--r--src/tests/eldbus_cxx/eldbus_cxx_suite.cc15
-rw-r--r--src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc15
-rw-r--r--src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc15
-rw-r--r--src/tests/elementary/efl_ui_suite.c2
-rw-r--r--src/tests/elementary/efl_ui_suite.h2
-rw-r--r--src/tests/elementary/efl_ui_test_config.c1
-rw-r--r--src/tests/elementary/efl_ui_test_relative_container.c (renamed from src/tests/elementary/efl_ui_test_relative_layout.c)58
-rw-r--r--src/tests/elementary/efl_ui_test_spotlight.c4
-rw-r--r--src/tests/elementary/elm_cxx_suite.cc15
-rw-r--r--src/tests/elementary/elm_test_check.c68
-rw-r--r--src/tests/elementary/elm_test_genlist.c194
-rw-r--r--src/tests/elementary/elm_test_layout.c45
-rw-r--r--src/tests/elementary/meson.build2
-rw-r--r--src/tests/elementary/spec/efl_test_basics.c69
-rw-r--r--src/tests/elementary/spec/efl_test_multi_selectable.c10
-rw-r--r--src/tests/elementary/spec/efl_test_pack.c2
-rw-r--r--src/tests/elementary/spec/efl_test_pack_linear.c142
-rw-r--r--src/tests/elementary/spec/efl_ui_spec_suite.c52
-rw-r--r--src/tests/elementary/spec/efl_ui_spec_suite.h2
-rwxr-xr-xsrc/tests/elementary/spec/generator.py2
-rw-r--r--src/tests/elementary/spec/meson.build3
-rw-r--r--src/tests/elementary/suite_helpers.c97
-rw-r--r--src/tests/elementary/suite_helpers.h10
-rw-r--r--src/tests/elementary_cxx/cxx_compile_test.cc15
-rw-r--r--src/tests/elementary_cxx/cxx_dummy_compile_test.cc15
-rw-r--r--src/tests/eo_cxx/eo_cxx_suite.cc15
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.h2
-rw-r--r--src/tests/eolian/data/struct_ref.h2
-rw-r--r--src/tests/eolian/data/typedef_ref.h2
-rw-r--r--src/tests/eolian_cxx/complex_cxx.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_suite.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_address_of.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_binding.cc141
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_documentation.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_generate.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_parse.cc15
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc15
-rw-r--r--src/tests/eolian_cxx/name_name_cxx.cc15
-rw-r--r--src/tests/eolian_cxx/property_holder.eo42
-rw-r--r--src/tests/evas/efl_canvas_animation.c40
-rw-r--r--src/tests/evas/evas_suite.c1
-rw-r--r--src/tests/evas/evas_suite.h1
-rw-r--r--src/tests/evas/evas_test_mesh.c124
-rw-r--r--src/tests/evas/evas_test_object.c158
-rw-r--r--src/tests/evas/evas_test_textblock.c20
-rw-r--r--src/tests/evas/fonts/NotoColorEmoji.ttfbin7297112 -> 0 bytes
-rw-r--r--src/tests/evas/fonts/NotoEmoji-Regular.ttfbin418804 -> 0 bytes
-rw-r--r--src/tests/evas/meson.build1
-rw-r--r--src/tests/evas_cxx/cxx_compile_test.cc15
646 files changed, 14732 insertions, 5556 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 97fcb17..086bf92 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
17 # - RPM fusion repo for xine and libvlc 17 # - RPM fusion repo for xine and libvlc
18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
19 -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \ 19 -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \
20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \ 20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=gstreamer,libvlc,xine \
21 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ 21 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
22 -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true" 22 -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true"
23 23
@@ -57,10 +57,6 @@ if [ "$DISTRO" != "" ] ; then
57 fi 57 fi
58 58
59 if [ "$1" = "coverity" ]; then 59 if [ "$1" = "coverity" ]; then
60# if [ $(date +%A) != "Saturday" ]; then
61# echo "Not Saturday so we are not running our weekly Coverity scan build."
62# exit 0
63# fi
64 OPTS="$OPTS $WAYLAND_LINUX_COPTS" 60 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
65 travis_fold cov-download cov-download 61 travis_fold cov-download cov-download
66 docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh' 62 docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 36f1f2d..1578b3c 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -22,16 +22,12 @@ NUM_TRIES=5
22 22
23travis_fold check "ninja test" 23travis_fold check "ninja test"
24if [ "$DISTRO" != "" ] ; then 24if [ "$DISTRO" != "" ] ; then
25 # disable them for this distros, after meson 0.49 is out, this can be removed 25 for tries in $(seq 1 ${NUM_TRIES}); do
26 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be 26 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
27 if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then 27 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
28 for tries in $(seq 1 ${NUM_TRIES}); do 28 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
29 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break 29 false
30 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt 30 done
31 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
32 false
33 done
34 fi
35fi 31fi
36ret=$? 32ret=$?
37travis_endfold check 33travis_endfold check
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index e175955..30f7d7c 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -8,9 +8,6 @@ fi
8travis_fold ninja ninja 8travis_fold ninja ninja
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 if [ "$1" = "coverity" ] ; then 10 if [ "$1" = "coverity" ] ; then
11# if [ $(date +%A) != "Saturday" ]; then
12# exit 0
13# fi
14 docker exec --env EIO_MONITOR_POLL=1 --env PATH="/src/cov-analysis-linux64-2019.03/bin:$PATH" $(cat $HOME/cid) sh -c "cov-build --dir cov-int ninja -C build" 11 docker exec --env EIO_MONITOR_POLL=1 --env PATH="/src/cov-analysis-linux64-2019.03/bin:$PATH" $(cat $HOME/cid) sh -c "cov-build --dir cov-int ninja -C build"
15 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c "tar caf efl-$(git rev-parse --short HEAD).xz cov-int" 12 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c "tar caf efl-$(git rev-parse --short HEAD).xz cov-int"
16 docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh" 13 docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh"
diff --git a/.ci/ci-setup-ccache.sh b/.ci/ci-setup-ccache.sh
index 0a50878..ab7d3b8 100755
--- a/.ci/ci-setup-ccache.sh
+++ b/.ci/ci-setup-ccache.sh
@@ -7,6 +7,7 @@ if [ "$DISTRO" != "" ] ; then
7 docker exec $(cat $HOME/cid) ccache -pz 7 docker exec $(cat $HOME/cid) ccache -pz
8else 8else
9 cp .ci/ccache.conf ~/.ccache 9 cp .ci/ccache.conf ~/.ccache
10 ccache -o base_dir="$(pwd)" 10 sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
11 echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
11 ccache -pz 12 ccache -pz
12fi 13fi
diff --git a/.ci/docker-ccache-setup.sh b/.ci/docker-ccache-setup.sh
index 748e743..caba08a 100755
--- a/.ci/docker-ccache-setup.sh
+++ b/.ci/docker-ccache-setup.sh
@@ -5,7 +5,9 @@ CI_BUILD_TYPE="$1"
5cp .ci/ccache.conf ~/.ccache 5cp .ci/ccache.conf ~/.ccache
6 6
7if [ "$1" = "release-ready" ] ; then 7if [ "$1" = "release-ready" ] ; then
8 ccache -o base_dir="$(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" 8 sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
9 echo "base_dir = $(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" >> ~/.ccache/ccache.conf
9else 10else
10 ccache -o base_dir=$(pwd) 11 sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
12 echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
11fi 13fi
diff --git a/.gitignore b/.gitignore
index ead1bd9..f04fa5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@ Session.vim
94/.settings/ 94/.settings/
95efl_libs.csv 95efl_libs.csv
96.vscode/ 96.vscode/
97.uuid
diff --git a/.lgtm.yml b/.lgtm.yml
new file mode 100644
index 0000000..047563d
--- /dev/null
+++ b/.lgtm.yml
@@ -0,0 +1,7 @@
1extraction:
2 python:
3 python_setup:
4 version: 3
5queries:
6 -
7 exclude: cpp/fixme-comment
diff --git a/.travis.yml b/.travis.yml
index 08c9fc2..e42f637 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
1version: ~> 1.0
2
1language: c 3language: c
2cache: 4cache:
3 directories: 5 directories:
4 - $HOME/cachedir 6 - $HOME/cachedir
5 - $HOME/.ccache 7 - $HOME/.ccache
6sudo: required
7dist: trusty 8dist: trusty
8 9
9osx_image: xcode10.2 10osx_image: xcode10.2
@@ -46,30 +47,30 @@ jobs:
46 include: 47 include:
47 - os: osx 48 - os: osx
48 - os: linux 49 - os: linux
49 env: DISTRO=Fedora30-mingw CI_BUILD_TYPE=mingw 50 env: DISTRO=Fedora31-mingw CI_BUILD_TYPE=mingw
50 - os: linux 51 - os: linux
51 env: DISTRO=Fedora30 CI_BUILD_TYPE=options-enabled 52 env: DISTRO=Fedora31 CI_BUILD_TYPE=options-enabled
52 - os: linux 53 - os: linux
53 env: DISTRO=Fedora30 CI_BUILD_TYPE=options-disabled 54 env: DISTRO=Fedora31 CI_BUILD_TYPE=options-disabled
54 - os: linux 55 - os: linux
55 env: DISTRO=Fedora30 CI_BUILD_TYPE=wayland 56 env: DISTRO=Fedora31 CI_BUILD_TYPE=wayland
56 - os: linux 57 - os: linux
57 env: DISTRO=Fedora30 CI_BUILD_TYPE=default 58 env: DISTRO=Fedora31 CI_BUILD_TYPE=default
58 - os: linux 59 - os: linux
59 if: type = cron 60 if: type = cron
60 env: DISTRO=Fedora30 CI_BUILD_TYPE=release-ready 61 env: DISTRO=Fedora31 CI_BUILD_TYPE=release-ready
61 - os: linux 62 - os: linux
62 if: type = cron 63 if: type = cron
63 env: DISTRO=Ubuntu1804 64 env: DISTRO=Ubuntu1804
64 - os: linux 65 - os: linux
65 if: type = cron 66 if: type = cron
66 env: DISTRO=Ubuntu1904 67 env: DISTRO=Ubuntu1910
67 - os: linux 68 - os: linux
68 if: type = cron 69 if: type = cron
69 env: DISTRO=Debian96 70 env: DISTRO=Debian96
70 - os: linux 71 - os: linux
71 if: type = cron 72 if: type = cron
72 env: DISTRO=Fedora30 CI_BUILD_TYPE=coverity 73 env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
73 74
74services: 75services:
75 - docker 76 - docker
@@ -124,7 +125,6 @@ notifications:
124 - "chat.freenode.net#edevelop" 125 - "chat.freenode.net#edevelop"
125 on_success: change 126 on_success: change
126 on_failure: always 127 on_failure: always
127 on_cancel: never
128 template: 128 template:
129 - "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})" 129 - "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})"
130 - "Commit: %{commit_subject} (%{commit}) from %{author}" 130 - "Commit: %{commit_subject} (%{commit}) from %{author}"
diff --git a/AUTHORS b/AUTHORS
index 66237b1..964f645 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -395,6 +395,46 @@ Jérôme Pinot <ngc891@gmail.com>
395EFL-C++ 395EFL-C++
396------- 396-------
397Savio Sena <savio@expertisesolutions.com.br> 397Savio Sena <savio@expertisesolutions.com.br>
398Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
399Vitor Sousa <vitorsousa@expertisesolutions.com.br>
400Lauro Moura <lauromoura@expertisesolutions.com.br>
401Jean-Philippe Andre <jp.andre@samsung.com>
402Luciana Magno de Almeida <luciana@expertisesolutions.com.br>
403Jaehyun Cho <jae_hyun.cho@samsung.com>
404Daniel Kolesa <quaker66@gmail.com>
405Vincent Torri <vtorri at univ-evry dot fr>
406Stefan Schmidt <stefan@datenfreihafen.org>
407Cedric BAIL <cedric.bail@free.fr>
408Xavi Artigas <xavierartigas@yahoo.es>
409YeongJong Lee <yj34.lee@samsung.com>
410Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
411Larry Lira <larry@expertisesolutions.com.br>
412WooHyun Jung (woohyun) <woohyun0705@gmail.com>
413Marcel Hollerbach <marcel-hollerbach@t-online.de>
414Daniel Zaoui <daniel.zaoui@samsung.com>
415Sanghyeon Lee <sh10233.lee@samsung.com>
416Thiep Ha <thiepha@gmail.com>
417Vinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>
418Bryce Harrington <bryce@osg.samsung.com>
419Tom Hacohen <tom@stosb.com>
420Carsten Haitzler <raster@rasterman.com>
421Andrew Williams <andy@eandywilliams.me>
422Amitesh Singh <singh.amitesh@gmail.com> <amitesh.sh@samsung.com>
423
424EFL-C#
425------
426
427Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
428Vitor Sousa <vitorsousa@expertisesolutions.com.br>
429Lauro Moura <lauromoura@expertisesolutions.com.br>
430Jaehyun Cho <jae_hyun.cho@samsung.com>
431Xavi Artigas <xavierartigas@yahoo.es>
432Marcel Hollerbach <marcel-hollerbach@t-online.de>
433YeongJong Lee <yj34.lee@samsung.com>
434Daniel Kolesa <quaker66@gmail.com>
435Vincent Torri <vtorri at univ-evry dot fr>
436WooHyun Jung (woohyun) <woohyun0705@gmail.com>
437Jean-Philippe Andre <jp.andre@samsung.com>
398 438
399ELua 439ELua
400---- 440----
diff --git a/COPYING b/COPYING
index e40f300..7079647 100644
--- a/COPYING
+++ b/COPYING
@@ -37,6 +37,8 @@ elementary: licenses/COPYING.LGPL
37generic/evas: licenses/COPYING.GPL (separate binary/executable) 37generic/evas: licenses/COPYING.GPL (separate binary/executable)
38generic/emotion: licenses/COPYING.GPL (separate binary/executable) 38generic/emotion: licenses/COPYING.GPL (separate binary/executable)
39efl: licenses/COPYING.LGPL 39efl: licenses/COPYING.LGPL
40csharp bindings: licenses/COPYING.ASL
41cxx bindings: licenses/COPYING.ASL
40 42
41NOTE: If linked together, the result will be effectively be LGPL (or 43NOTE: If linked together, the result will be effectively be LGPL (or
42GPL if escape is used) due to license characteristics. 44GPL if escape is used) due to license characteristics.
diff --git a/README b/README
index 2f0c41d..de08b78 100644
--- a/README
+++ b/README
@@ -539,4 +539,3 @@ one can use "gnutls" (some distros are strict about licenses and want gnutls
539instead of openssl) You can switch to gnutls with: 539instead of openssl) You can switch to gnutls with:
540 540
541 -Dcrypto=gnutls 541 -Dcrypto=gnutls
542
diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc
index 091cfb1..71a050d 100644
--- a/data/elementary/themes/edc/elm/scroller.edc
+++ b/data/elementary/themes/edc/elm/scroller.edc
@@ -34,91 +34,9 @@ group { name: "elm/scroller/base/default";
34 images.image: "sym_left_dark_normal.png" COMP; 34 images.image: "sym_left_dark_normal.png" COMP;
35 images.image: "sym_right_dark_normal.png" COMP; 35 images.image: "sym_right_dark_normal.png" COMP;
36 36
37
38 data.item: "focus_highlight" "on"; 37 data.item: "focus_highlight" "on";
39 38
40 script {
41 public loop_x, loop_y;
42 public action_on_pos_vbar(val) {
43 new x, y , w, h, x1, y1 , w1, h1;
44
45 get_geometry(PART:"y_vbar_up", x,y,w, h);
46 get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
47
48 if(((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y)))
49 {
50 set_state(PART:"arrow1_vbar", "hidden", 0.0);
51 set_state(PART:"sb_vbar_a1", "hidden", 0.0);
52 }
53 else
54 {
55 set_state(PART:"arrow1_vbar", "default", 0.0);
56 set_state(PART:"sb_vbar_a1", "default", 0.0);
57 }
58
59 get_geometry(PART:"y_vbar_down", x,y,w, h);
60 get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
61
62 if(((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y)))
63 {
64 set_state(PART:"arrow2_vbar", "hidden", 0.0);
65 set_state(PART:"sb_vbar_a2", "hidden", 0.0);
66 }
67 else
68 {
69 set_state(PART:"arrow2_vbar", "default", 0.0);
70 set_state(PART:"sb_vbar_a2", "default", 0.0);
71 }
72
73 if(val < 10)
74 timer(0.1,"action_on_pos_vbar", val+1);
75 }
76
77 public action_on_pos_hbar(val) {
78 new x, y , w, h, x1, y1 , w1, h1;
79
80 get_geometry(PART:"x_hbar_left", x,y,w, h);
81 get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
82
83 if(((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x)))
84 {
85 set_state(PART:"arrow1_hbar", "hidden", 0.0);
86 set_state(PART:"sb_hbar_a1", "hidden", 0.0);
87 }
88 else
89 {
90 set_state(PART:"arrow1_hbar", "default", 0.0);
91 set_state(PART:"sb_hbar_a1", "default", 0.0);
92 }
93
94 get_geometry(PART:"x_hbar_right", x,y,w, h);
95 get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
96
97 if(((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x)))
98 {
99 set_state(PART:"arrow2_hbar", "hidden", 0.0);
100 set_state(PART:"sb_hbar_a2", "hidden", 0.0);
101 }
102 else
103 {
104 set_state(PART:"arrow2_hbar", "default", 0.0);
105 set_state(PART:"sb_hbar_a2", "default", 0.0);
106 }
107
108 if(val < 10)
109 timer(0.1,"action_on_pos_hbar", val+1);
110 }
111 }
112
113 parts { 39 parts {
114 program {
115 signal: "load"; source: "";
116 script {
117 emit("reload", "elm");
118 action_on_pos_vbar(0);
119 action_on_pos_hbar(0);
120 }
121 }
122// vert bar //////////////////////////////////////////////////////////////// 40// vert bar ////////////////////////////////////////////////////////////////
123 part { name: "sb_vbar_show"; type: RECT; 41 part { name: "sb_vbar_show"; type: RECT;
124 description { state: "default" 0.0; 42 description { state: "default" 0.0;
@@ -321,7 +239,6 @@ group { name: "elm/scroller/base/default";
321 target: "y_vbar_down"; 239 target: "y_vbar_down";
322 target: "arrow1_vbar_indent"; 240 target: "arrow1_vbar_indent";
323 target: "arrow2_vbar_indent"; 241 target: "arrow2_vbar_indent";
324 after: "check_pos_vbar";
325 } 242 }
326 program { 243 program {
327 signal: "elm,action,hide,vbar"; source: "elm"; 244 signal: "elm,action,hide,vbar"; source: "elm";
@@ -340,11 +257,13 @@ group { name: "elm/scroller/base/default";
340 } 257 }
341 program { 258 program {
342 signal: "mouse,down,1*"; source: "sb_vbar_a1";//ok 259 signal: "mouse,down,1*"; source: "sb_vbar_a1";//ok
260 filter: "sb_vbar_a1" "default";
343 action: STATE_SET "clicked" 0.0; 261 action: STATE_SET "clicked" 0.0;
344 target: "arrow1_vbar"; 262 target: "arrow1_vbar";
345 after: "anim1_up"; 263 after: "anim1_up";
346 } 264 }
347 program { name: "anim1_up"; 265 program { name: "anim1_up";
266 filter: "sb_vbar_a1" "default";
348 action: STATE_SET "default" 0.0; 267 action: STATE_SET "default" 0.0;
349 transition: LINEAR 0.1; 268 transition: LINEAR 0.1;
350 target: "arrow1_vbar"; 269 target: "arrow1_vbar";
@@ -356,11 +275,13 @@ group { name: "elm/scroller/base/default";
356 } 275 }
357 program { 276 program {
358 signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok 277 signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
278 filter: "sb_vbar_a2" "default";
359 action: STATE_SET "clicked" 0.0; 279 action: STATE_SET "clicked" 0.0;
360 target: "arrow2_vbar"; 280 target: "arrow2_vbar";
361 after: "anim1_down"; 281 after: "anim1_down";
362 } 282 }
363 program { name: "anim1_down"; 283 program { name: "anim1_down";
284 filter: "sb_vbar_a2" "default";
364 action: STATE_SET "default" 0.0; 285 action: STATE_SET "default" 0.0;
365 transition: LINEAR 0.1; 286 transition: LINEAR 0.1;
366 target: "arrow2_vbar"; 287 target: "arrow2_vbar";
@@ -372,40 +293,40 @@ group { name: "elm/scroller/base/default";
372 } 293 }
373 program { 294 program {
374 signal: "mouse,down,1*"; source: "sb_vbar_p1"; 295 signal: "mouse,down,1*"; source: "sb_vbar_p1";
296 filter: "sb_vbar_a1" "default";
375 action: DRAG_VAL_PAGE 0.0 -1.0; 297 action: DRAG_VAL_PAGE 0.0 -1.0;
376 target: "elm.dragable.vbar"; 298 target: "elm.dragable.vbar";
377 } 299 }
378 program { 300 program {
379 signal: "mouse,down,1*"; source: "sb_vbar_p2"; 301 signal: "mouse,down,1*"; source: "sb_vbar_p2";
302 filter: "sb_vbar_a2" "default";
380 action: DRAG_VAL_PAGE 0.0 1.0; 303 action: DRAG_VAL_PAGE 0.0 1.0;
381 target: "elm.dragable.vbar"; 304 target: "elm.dragable.vbar";
382 } 305 }
383 program { 306 program {
384 signal: "elm,action,scroll"; source: "elm"; 307 signal: "elm,action,show,up"; source: "elm";
385 script { 308 action: STATE_SET "default" 0.0;
386 action_on_pos_vbar(10); 309 target: "arrow1_vbar";
387 } 310 target: "sb_vbar_a1";
388 } 311 }
389 program { name: "check_pos_vbar"; 312 program {
390 script { 313 signal: "elm,action,hide,up"; source: "elm";
391 action_on_pos_vbar(10); 314 action: STATE_SET "hidden" 0.0;
392 } 315 target: "arrow1_vbar";
316 target: "sb_vbar_a1";
393 } 317 }
394 program { name: "loop_set_vbar"; 318 program {
395 signal: "elm,loop_y,set"; source: "elm"; 319 signal: "elm,action,show,down"; source: "elm";
396 script { 320 action: STATE_SET "default" 0.0;
397 set_int(loop_y, 1); 321 target: "arrow2_vbar";
398 action_on_pos_vbar(10); 322 target: "sb_vbar_a2";
399 }
400 } 323 }
401 program { name: "loop_unset_vbar"; 324 program {
402 signal: "elm,loop_y,unset"; source: "elm"; 325 signal: "elm,action,hide,down"; source: "elm";
403 script { 326 action: STATE_SET "hidden" 0.0;
404 set_int(loop_y, 0); 327 target: "arrow2_vbar";
405 action_on_pos_vbar(10); 328 target: "sb_vbar_a2";
406 }
407 } 329 }
408
409// horiz bar ///////////////////////////////////////////////////////////// 330// horiz bar /////////////////////////////////////////////////////////////
410 part { name: "sb_hbar_show"; type: RECT; 331 part { name: "sb_hbar_show"; type: RECT;
411 description { state: "default" 0.0; 332 description { state: "default" 0.0;
@@ -608,7 +529,6 @@ group { name: "elm/scroller/base/default";
608 target: "x_hbar_right"; 529 target: "x_hbar_right";
609 target: "arrow1_hbar_indent"; 530 target: "arrow1_hbar_indent";
610 target: "arrow2_hbar_indent"; 531 target: "arrow2_hbar_indent";
611 after: "check_pos_hbar";
612 } 532 }
613 program { 533 program {
614 signal: "elm,action,hide,hbar"; source: "elm"; 534 signal: "elm,action,hide,hbar"; source: "elm";
@@ -627,11 +547,13 @@ group { name: "elm/scroller/base/default";
627 } 547 }
628 program { 548 program {
629 signal: "mouse,down,1*"; source: "sb_hbar_a1"; 549 signal: "mouse,down,1*"; source: "sb_hbar_a1";
550 filter: "sb_hbar_a1" "default";
630 action: STATE_SET "clicked" 0.0; 551 action: STATE_SET "clicked" 0.0;
631 target: "arrow1_hbar"; 552 target: "arrow1_hbar";
632 after: "anim1_left"; 553 after: "anim1_left";
633 } 554 }
634 program { name: "anim1_left"; 555 program { name: "anim1_left";
556 filter: "sb_hbar_a1" "default";
635 action: STATE_SET "default" 0.0; 557 action: STATE_SET "default" 0.0;
636 transition: LINEAR 0.1; 558 transition: LINEAR 0.1;
637 target: "arrow1_hbar"; 559 target: "arrow1_hbar";
@@ -643,11 +565,13 @@ group { name: "elm/scroller/base/default";
643 } 565 }
644 program { 566 program {
645 signal: "mouse,down,1*"; source: "sb_hbar_a2"; 567 signal: "mouse,down,1*"; source: "sb_hbar_a2";
568 filter: "sb_hbar_a2" "default";
646 action: STATE_SET "clicked" 0.0; 569 action: STATE_SET "clicked" 0.0;
647 target: "arrow2_hbar"; 570 target: "arrow2_hbar";
648 after: "anim2_left"; 571 after: "anim2_left";
649 } 572 }
650 program { name: "anim2_left"; 573 program { name: "anim2_left";
574 filter: "sb_hbar_a2" "default";
651 action: STATE_SET "default" 0.0; 575 action: STATE_SET "default" 0.0;
652 transition: LINEAR 0.1; 576 transition: LINEAR 0.1;
653 target: "arrow2_hbar"; 577 target: "arrow2_hbar";
@@ -659,40 +583,39 @@ group { name: "elm/scroller/base/default";
659 } 583 }
660 program { 584 program {
661 signal: "mouse,down,1*"; source: "sb_hbar_p1"; 585 signal: "mouse,down,1*"; source: "sb_hbar_p1";
586 filter: "sb_hbar_a1" "default";
662 action: DRAG_VAL_PAGE -1.0 0.0; 587 action: DRAG_VAL_PAGE -1.0 0.0;
663 target: "elm.dragable.hbar"; 588 target: "elm.dragable.hbar";
664 after: "check_pos_hbar";
665 } 589 }
666 program { 590 program {
667 signal: "mouse,down,1*"; source: "sb_hbar_p2"; 591 signal: "mouse,down,1*"; source: "sb_hbar_p2";
592 filter: "sb_hbar_a2" "default";
668 action: DRAG_VAL_PAGE 1.0 0.0; 593 action: DRAG_VAL_PAGE 1.0 0.0;
669 target: "elm.dragable.hbar"; 594 target: "elm.dragable.hbar";
670 after: "check_pos_hbar";
671 } 595 }
672 program { 596 program {
673 signal: "elm,action,scroll"; source: "elm"; 597 signal: "elm,action,show,left"; source: "elm";
674 script { 598 action: STATE_SET "default" 0.0;
675 action_on_pos_hbar(10); 599 target: "arrow1_hbar";
676 } 600 target: "sb_hbar_a1";
677 } 601 }
678 program { name: "check_pos_hbar"; 602 program {
679 script { 603 signal: "elm,action,hide,left"; source: "elm";
680 action_on_pos_hbar(10); 604 action: STATE_SET "hidden" 0.0;
681 } 605 target: "arrow1_hbar";
606 target: "sb_hbar_a1";
682 } 607 }
683 program { name: "loop_set_hbar"; 608 program {
684 signal: "elm,loop_x,set"; source: "elm"; 609 signal: "elm,action,show,right"; source: "elm";
685 script { 610 action: STATE_SET "default" 0.0;
686 set_int(loop_x, 1); 611 target: "arrow2_hbar";
687 action_on_pos_hbar(10); 612 target: "sb_hbar_a2";
688 }
689 } 613 }
690 program { name: "loop_unset_hbar"; 614 program {
691 signal: "elm,loop_x,unset"; source: "elm"; 615 signal: "elm,action,hide,right"; source: "elm";
692 script { 616 action: STATE_SET "hidden" 0.0;
693 set_int(loop_x, 0); 617 target: "arrow2_hbar";
694 action_on_pos_hbar(10); 618 target: "sb_hbar_a2";
695 }
696 } 619 }
697 part { name: "bg"; type: RECT; 620 part { name: "bg"; type: RECT;
698 description { state: "default" 0.0; 621 description { state: "default" 0.0;
diff --git a/data/elementary/themes/edc/pointer.edc b/data/elementary/themes/edc/pointer.edc
index 3f57e27..b30c92f 100644
--- a/data/elementary/themes/edc/pointer.edc
+++ b/data/elementary/themes/edc/pointer.edc
@@ -39,7 +39,6 @@ group { name: "e/pointer/enlightenment/default/color";
39 part { name: "e.swallow.hotspot"; type: SWALLOW; 39 part { name: "e.swallow.hotspot"; type: SWALLOW;
40 description { state: "default" 0.0; 40 description { state: "default" 0.0;
41 fixed: 1 1; 41 fixed: 1 1;
42 visible: 0;
43 rel1.relative: (5/32) (5/32); 42 rel1.relative: (5/32) (5/32);
44 rel.to: "base"; 43 rel.to: "base";
45 rel2.relative: (5/32) (5/32); 44 rel2.relative: (5/32) (5/32);
@@ -118,7 +117,6 @@ group { name: "e/pointer/enlightenment/default/mono";
118 part { name: "e.swallow.hotspot"; type: SWALLOW; 117 part { name: "e.swallow.hotspot"; type: SWALLOW;
119 description { state: "default" 0.0; 118 description { state: "default" 0.0;
120 fixed: 1 1; 119 fixed: 1 1;
121 visible: 0;
122 rel1.offset: 6 8; 120 rel1.offset: 6 8;
123 rel1.to: "base"; 121 rel1.to: "base";
124 rel2.offset: 6 8; 122 rel2.offset: 6 8;
@@ -468,7 +466,6 @@ group { name: "e/pointer/enlightenment/entry/color";
468 part { name: "e.swallow.hotspot"; type: SWALLOW; 466 part { name: "e.swallow.hotspot"; type: SWALLOW;
469 description { state: "default" 0.0; 467 description { state: "default" 0.0;
470 fixed: 1 1; 468 fixed: 1 1;
471 visible: 0;
472 rel1.relative: 0.5 0.5; 469 rel1.relative: 0.5 0.5;
473 rel1.to: "base"; 470 rel1.to: "base";
474 rel2.to: "base"; 471 rel2.to: "base";
diff --git a/doc/efl_copy.sh b/doc/efl_copy.sh
new file mode 100755
index 0000000..af975fb
--- /dev/null
+++ b/doc/efl_copy.sh
@@ -0,0 +1 @@
cp $@
diff --git a/doc/meson.build b/doc/meson.build
index 5598b18..18b9aee 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -104,6 +104,7 @@ widget_preview_eps = custom_target('widget_preview_prefs_epc',
104 104
105shot_sh = find_program('shot.sh') 105shot_sh = find_program('shot.sh')
106tar = find_program('tar') 106tar = find_program('tar')
107efl_copy = find_program('efl_copy.sh')
107 108
108foreach text_filter_property : text_filter_properties 109foreach text_filter_property : text_filter_properties
109 text = text_filter_property[0] 110 text = text_filter_property[0]
@@ -181,15 +182,22 @@ doc_target += custom_target('doxygen',
181 build_by_default: false 182 build_by_default: false
182) 183)
183 184
185# This is not pretty but meson does not seem to allow wildcards in plain cp commands
186copy_images = custom_target('documentation images',
187 command: [efl_copy, '-rf', join_paths(meson.current_source_dir(), 'img', '*.png'), 'html'],
188 output: ['empty_img_copy'],
189 build_by_default: false
190)
191
184compress_target = custom_target('package_doc_tar', 192compress_target = custom_target('package_doc_tar',
185 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'], 193 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
186 output: 'efl-'+meson.project_version()+'-doc.tar.xz', 194 output: 'efl-'+meson.project_version()+'-doc.tar.xz',
187 depends: doc_target, 195 depends: [doc_target, copy_images],
188 build_by_default: false 196 build_by_default: false
189) 197)
190 198
191run_target('doc', 199run_target('doc',
192 command: ['echo', 'Documentation sucessfully build!'], 200 command: ['echo', 'Documentation built successfully'],
193 depends: compress_target, 201 depends: compress_target,
194) 202)
195 203
diff --git a/licenses/COPYING.ASL b/licenses/COPYING.ASL
new file mode 100644
index 0000000..57bc88a
--- /dev/null
+++ b/licenses/COPYING.ASL
@@ -0,0 +1,202 @@
1 Apache License
2 Version 2.0, January 2004
3 http://www.apache.org/licenses/
4
5 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
7 1. Definitions.
8
9 "License" shall mean the terms and conditions for use, reproduction,
10 and distribution as defined by Sections 1 through 9 of this document.
11
12 "Licensor" shall mean the copyright owner or entity authorized by
13 the copyright owner that is granting the License.
14
15 "Legal Entity" shall mean the union of the acting entity and all
16 other entities that control, are controlled by, or are under common
17 control with that entity. For the purposes of this definition,
18 "control" means (i) the power, direct or indirect, to cause the
19 direction or management of such entity, whether by contract or
20 otherwise, or (ii) ownership of fifty percent (50%) or more of the
21 outstanding shares, or (iii) beneficial ownership of such entity.
22
23 "You" (or "Your") shall mean an individual or Legal Entity
24 exercising permissions granted by this License.
25
26 "Source" form shall mean the preferred form for making modifications,
27 including but not limited to software source code, documentation
28 source, and configuration files.
29
30 "Object" form shall mean any form resulting from mechanical
31 transformation or translation of a Source form, including but
32 not limited to compiled object code, generated documentation,
33 and conversions to other media types.
34
35 "Work" shall mean the work of authorship, whether in Source or
36 Object form, made available under the License, as indicated by a
37 copyright notice that is included in or attached to the work
38 (an example is provided in the Appendix below).
39
40 "Derivative Works" shall mean any work, whether in Source or Object
41 form, that is based on (or derived from) the Work and for which the
42 editorial revisions, annotations, elaborations, or other modifications
43 represent, as a whole, an original work of authorship. For the purposes
44 of this License, Derivative Works shall not include works that remain
45 separable from, or merely link (or bind by name) to the interfaces of,
46 the Work and Derivative Works thereof.
47
48 "Contribution" shall mean any work of authorship, including
49 the original version of the Work and any modifications or additions
50 to that Work or Derivative Works thereof, that is intentionally
51 submitted to Licensor for inclusion in the Work by the copyright owner
52 or by an individual or Legal Entity authorized to submit on behalf of
53 the copyright owner. For the purposes of this definition, "submitted"
54 means any form of electronic, verbal, or written communication sent
55 to the Licensor or its representatives, including but not limited to
56 communication on electronic mailing lists, source code control systems,
57 and issue tracking systems that are managed by, or on behalf of, the
58 Licensor for the purpose of discussing and improving the Work, but
59 excluding communication that is conspicuously marked or otherwise
60 designated in writing by the copyright owner as "Not a Contribution."
61
62 "Contributor" shall mean Licensor and any individual or Legal Entity
63 on behalf of whom a Contribution has been received by Licensor and
64 subsequently incorporated within the Work.
65
66 2. Grant of Copyright License. Subject to the terms and conditions of
67 this License, each Contributor hereby grants to You a perpetual,
68 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69 copyright license to reproduce, prepare Derivative Works of,
70 publicly display, publicly perform, sublicense, and distribute the
71 Work and such Derivative Works in Source or Object form.
72
73 3. Grant of Patent License. Subject to the terms and conditions of
74 this License, each Contributor hereby grants to You a perpetual,
75 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76 (except as stated in this section) patent license to make, have made,
77 use, offer to sell, sell, import, and otherwise transfer the Work,
78 where such license applies only to those patent claims licensable
79 by such Contributor that are necessarily infringed by their
80 Contribution(s) alone or by combination of their Contribution(s)
81 with the Work to which such Contribution(s) was submitted. If You
82 institute patent litigation against any entity (including a
83 cross-claim or counterclaim in a lawsuit) alleging that the Work
84 or a Contribution incorporated within the Work constitutes direct
85 or contributory patent infringement, then any patent licenses
86 granted to You under this License for that Work shall terminate
87 as of the date such litigation is filed.
88
89 4. Redistribution. You may reproduce and distribute copies of the
90 Work or Derivative Works thereof in any medium, with or without
91 modifications, and in Source or Object form, provided that You
92 meet the following conditions:
93
94 (a) You must give any other recipients of the Work or
95 Derivative Works a copy of this License; and
96
97 (b) You must cause any modified files to carry prominent notices
98 stating that You changed the files; and
99
100 (c) You must retain, in the Source form of any Derivative Works
101 that You distribute, all copyright, patent, trademark, and
102 attribution notices from the Source form of the Work,
103 excluding those notices that do not pertain to any part of
104 the Derivative Works; and
105
106 (d) If the Work includes a "NOTICE" text file as part of its
107 distribution, then any Derivative Works that You distribute must
108 include a readable copy of the attribution notices contained
109 within such NOTICE file, excluding those notices that do not
110 pertain to any part of the Derivative Works, in at least one
111 of the following places: within a NOTICE text file distributed
112 as part of the Derivative Works; within the Source form or
113 documentation, if provided along with the Derivative Works; or,
114 within a display generated by the Derivative Works, if and
115 wherever such third-party notices normally appear. The contents
116 of the NOTICE file are for informational purposes only and
117 do not modify the License. You may add Your own attribution
118 notices within Derivative Works that You distribute, alongside
119 or as an addendum to the NOTICE text from the Work, provided
120 that such additional attribution notices cannot be construed
121 as modifying the License.
122
123 You may add Your own copyright statement to Your modifications and
124 may provide additional or different license terms and conditions
125 for use, reproduction, or distribution of Your modifications, or
126 for any such Derivative Works as a whole, provided Your use,
127 reproduction, and distribution of the Work otherwise complies with
128 the conditions stated in this License.
129
130 5. Submission of Contributions. Unless You explicitly state otherwise,
131 any Contribution intentionally submitted for inclusion in the Work
132 by You to the Licensor shall be under the terms and conditions of
133 this License, without any additional terms or conditions.
134 Notwithstanding the above, nothing herein shall supersede or modify
135 the terms of any separate license agreement you may have executed
136 with Licensor regarding such Contributions.
137
138 6. Trademarks. This License does not grant permission to use the trade
139 names, trademarks, service marks, or product names of the Licensor,
140 except as required for reasonable and customary use in describing the
141 origin of the Work and reproducing the content of the NOTICE file.
142
143 7. Disclaimer of Warranty. Unless required by applicable law or
144 agreed to in writing, Licensor provides the Work (and each
145 Contributor provides its Contributions) on an "AS IS" BASIS,
146 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147 implied, including, without limitation, any warranties or conditions
148 of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149 PARTICULAR PURPOSE. You are solely responsible for determining the
150 appropriateness of using or redistributing the Work and assume any
151 risks associated with Your exercise of permissions under this License.
152
153 8. Limitation of Liability. In no event and under no legal theory,
154 whether in tort (including negligence), contract, or otherwise,
155 unless required by applicable law (such as deliberate and grossly
156 negligent acts) or agreed to in writing, shall any Contributor be
157 liable to You for damages, including any direct, indirect, special,
158 incidental, or consequential damages of any character arising as a
159 result of this License or out of the use or inability to use the
160 Work (including but not limited to damages for loss of goodwill,
161 work stoppage, computer failure or malfunction, or any and all
162 other commercial damages or losses), even if such Contributor
163 has been advised of the possibility of such damages.
164
165 9. Accepting Warranty or Additional Liability. While redistributing
166 the Work or Derivative Works thereof, You may choose to offer,
167 and charge a fee for, acceptance of support, warranty, indemnity,
168 or other liability obligations and/or rights consistent with this
169 License. However, in accepting such obligations, You may act only
170 on Your own behalf and on Your sole responsibility, not on behalf
171 of any other Contributor, and only if You agree to indemnify,
172 defend, and hold each Contributor harmless for any liability
173 incurred by, or claims asserted against, such Contributor by reason
174 of your accepting any such warranty or additional liability.
175
176 END OF TERMS AND CONDITIONS
177
178 APPENDIX: How to apply the Apache License to your work.
179
180 To apply the Apache License to your work, attach the following
181 boilerplate notice, with the fields enclosed by brackets "[]"
182 replaced with your own identifying information. (Don't include
183 the brackets!) The text should be enclosed in the appropriate
184 comment syntax for the file format. We also recommend that a
185 file or class name and description of purpose be included on the
186 same "printed page" as the copyright notice for easier
187 identification within third-party archives.
188
189 Copyright [yyyy] [name of copyright owner]
190
191 Licensed under the Apache License, Version 2.0 (the "License");
192 you may not use this file except in compliance with the License.
193 You may obtain a copy of the License at
194
195 http://www.apache.org/licenses/LICENSE-2.0
196
197 Unless required by applicable law or agreed to in writing, software
198 distributed under the License is distributed on an "AS IS" BASIS,
199 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200 See the License for the specific language governing permissions and
201 limitations under the License.
202
diff --git a/meson.build b/meson.build
index 4de9757..702e383 100644
--- a/meson.build
+++ b/meson.build
@@ -249,13 +249,6 @@ ecore_evas_wayland_engine_include_dir = []
249 249
250evas_static_list = [] 250evas_static_list = []
251 251
252evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
253evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
254evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
255evas_goal = ['evas_goal' ,[], false, true, false, false, false, false, ['eina', 'efl', 'eo'], []]
256
257evas_settings = [ evas_lib, evas_img_modules, evas_goal, evas_engines ]
258
259subprojects = [ 252subprojects = [
260# name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs 253# name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs
261['evil' ,[] , false, true, false, false, false, false, [], []], 254['evil' ,[] , false, true, false, false, false, false, [], []],
@@ -284,7 +277,8 @@ subprojects = [
284['ector' ,[] , false, true, false, false, true, false, ['eina', 'efl'], ['draw', 'triangulator', 'freetype']], 277['ector' ,[] , false, true, false, false, true, false, ['eina', 'efl'], ['draw', 'triangulator', 'freetype']],
285['elput' ,['drm'] , false, true, false, false, true, false, ['eina', 'eldbus'], []], 278['elput' ,['drm'] , false, true, false, false, true, false, ['eina', 'eldbus'], []],
286['ecore_drm2' ,['drm'] , false, true, false, false, false, false, ['ecore'], ['libdrm']], 279['ecore_drm2' ,['drm'] , false, true, false, false, false, false, ['ecore'], ['libdrm']],
287['ecore_cocoa' ,['cocoa'] , false, true, false, false, false, false, ['eina'], []]] + evas_settings +[ 280['ecore_cocoa' ,['cocoa'] , false, true, false, false, false, false, ['eina'], []],
281['evas' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']],
288['ecore_input_evas' ,[] , false, true, false, false, false, false, ['eina', 'evas'], []], 282['ecore_input_evas' ,[] , false, true, false, false, false, false, ['eina', 'evas'], []],
289['ecore_evas' ,[] , true, true, true, false, false, false, ['evas', 'ector'], []], 283['ecore_evas' ,[] , true, true, true, false, false, false, ['evas', 'ector'], []],
290['ecore_imf' ,[] , true, true, false, false, false, false, ['eina'], []], 284['ecore_imf' ,[] , true, true, false, false, false, false, ['eina'], []],
diff --git a/meson_options.txt b/meson_options.txt
index 0a4702c..42a7397 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -323,6 +323,12 @@ option('mono-examples-dir',
323 description: 'Where eolian_mono will search for examples to embed into the documentation' 323 description: 'Where eolian_mono will search for examples to embed into the documentation'
324) 324)
325 325
326option('dotnet',
327 type: 'boolean',
328 value: false,
329 description: 'Enable building C# bindings with dotnet instead of mono'
330)
331
326option('lua-interpreter', 332option('lua-interpreter',
327 type: 'combo', 333 type: 'combo',
328 choices: ['luajit', 'lua'], 334 choices: ['luajit', 'lua'],
@@ -366,3 +372,9 @@ option('install-eo-files',
366 value: false, 372 value: false,
367 description : 'Install any eo file' 373 description : 'Install any eo file'
368) 374)
375
376option('mono-friend-assemblies',
377 type : 'array',
378 value : [],
379 description : 'List of friend assemblies that can access efl_mono assembly\'s internal types and members.'
380)
diff --git a/po/hu.po b/po/hu.po
index adcd4a1..2f4f416 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
1# SOME DESCRIPTIVE TITLE. 1# Hungarian translation for Efl.
2# Copyright (C) YEAR Enlightenment development team 2# Copyright (C) 2014 Enlightenment development team
3# This file is distributed under the same license as the PACKAGE package. 3# This file is put in the public domain.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 4# Páder Rezső <rezso@rezso.net>, 2014.
5# 5#
6#: src/lib/elementary/elm_config.c:4135 6#: src/lib/elementary/elm_config.c:4135
7msgid "" 7msgid ""
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index d3ae0c9..cacfdf2 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -842,7 +842,7 @@ _edje_circul(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
842 char *group = data; 842 char *group = data;
843 843
844 part_name = eina_list_data_get(eina_list_last(parts)); 844 part_name = eina_list_data_get(eina_list_last(parts));
845 strncat(buf, part_name, sizeof(buf) - 1); 845 strncpy(buf, part_name, sizeof(buf) - 1);
846 part_name[sizeof(buf) - 1] = 0; 846 part_name[sizeof(buf) - 1] = 0;
847 EINA_LIST_FOREACH(parts, l, part_name) 847 EINA_LIST_FOREACH(parts, l, part_name)
848 { 848 {
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index f33193d..0fff2cd 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -42,7 +42,7 @@ else
42 env = find_program('env', native: true) 42 env = find_program('env', native: true)
43 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()] 43 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
44 endif 44 endif
45 edje_depends = [edje_cc, epp, evas_engine_buffer_mod] 45 edje_depends = [edje_cc, epp, evas_engine_buffer_mod, embryo_cc]
46endif 46endif
47 47
48edje_decc_src = [ 48edje_decc_src = [
diff --git a/src/bin/efl_mono_msbuild_gen/main.cc b/src/bin/efl_mono_msbuild_gen/main.cc
index bf3d4db..d7ab599 100644
--- a/src/bin/efl_mono_msbuild_gen/main.cc
+++ b/src/bin/efl_mono_msbuild_gen/main.cc
@@ -1,3 +1,18 @@
1/*
2 * Copyright 2019 by its authors. See AUTHORS.
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
1 16
2#include <iostream> 17#include <iostream>
3#include <fstream> 18#include <fstream>
diff --git a/src/bin/efreet/efreet_desktop_cache_create.c b/src/bin/efreet/efreet_desktop_cache_create.c
index ec7553d..8988168 100644
--- a/src/bin/efreet/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -70,13 +70,22 @@ cache_add(Eet_File *ef, const char *path, const char *file_id, int priority EINA
70 *changed = 1; 70 *changed = 1;
71 INF(" NEW"); 71 INF(" NEW");
72 } 72 }
73 else if (ecore_file_mod_time(desk->orig_path) != desk->load_time) 73 else
74 { 74 {
75 efreet_desktop_free(desk); 75 struct stat st;
76 *changed = 1; 76 if (!stat(desk->orig_path, &st))
77 desk = efreet_desktop_uncached_new(path); 77 {
78 if (desk) INF(" CHANGED"); 78 time_t modtime = st.st_mtime;
79 else INF(" NO UNCACHED"); 79 if (modtime < st.st_ctime) modtime = st.st_ctime;
80 if (modtime != desk->load_time)
81 {
82 efreet_desktop_free(desk);
83 *changed = 1;
84 desk = efreet_desktop_uncached_new(path);
85 if (desk) INF(" CHANGED");
86 else INF(" NO UNCACHED");
87 }
88 }
80 } 89 }
81 if (!desk) return 1; 90 if (!desk) return 1;
82 if (file_id && old_file_ids && !eina_hash_find(old_file_ids->hash, file_id)) 91 if (file_id && old_file_ids && !eina_hash_find(old_file_ids->hash, file_id))
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index 502573c..342e184 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -155,7 +155,7 @@ elementary_test_src = [
155 'test_win_indicator.c', 155 'test_win_indicator.c',
156 'test_gesture_framework.c', 156 'test_gesture_framework.c',
157 'test_ui_tab_pager.c', 157 'test_ui_tab_pager.c',
158 'test_ui_relative_layout.c', 158 'test_ui_relative_container.c',
159 'test_ui_collection.c', 159 'test_ui_collection.c',
160 'test_ui_collection_view.c', 160 'test_ui_collection_view.c',
161 'test_ui_items.c', 161 'test_ui_items.c',
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index bcdb484..a78850a 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -243,7 +243,6 @@ void test_label_wrap(void *data, Evas_Object *obj, void *event_info);
243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info); 243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info);
244void test_label_colors(void *data, Evas_Object *obj, void *event_info); 244void test_label_colors(void *data, Evas_Object *obj, void *event_info);
245void test_label_emoji(void *data, Evas_Object *obj, void *event_info); 245void test_label_emoji(void *data, Evas_Object *obj, void *event_info);
246void test_label_variation_sequence(void *data, Evas_Object *obj, void *event_info);
247void test_conformant(void *data, Evas_Object *obj, void *event_info); 246void test_conformant(void *data, Evas_Object *obj, void *event_info);
248void test_conformant2(void *data, Evas_Object *obj, void *event_info); 247void test_conformant2(void *data, Evas_Object *obj, void *event_info);
249void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info); 248void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info);
@@ -398,7 +397,7 @@ void test_ui_spotlight_stack(void *data, Evas_Object *obj, void *event_info);
398void test_ui_spotlight_plain(void *data, Evas_Object *obj, void *event_info); 397void test_ui_spotlight_plain(void *data, Evas_Object *obj, void *event_info);
399void test_ui_spotlight_scroll(void *data, Evas_Object *obj, void *event_info); 398void test_ui_spotlight_scroll(void *data, Evas_Object *obj, void *event_info);
400 399
401void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info); 400void test_ui_relative_container(void *data, Evas_Object *obj, void *event_info);
402void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info); 401void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info);
403void test_efl_ui_collection_list(void *data, Evas_Object *obj, void *event_info); 402void test_efl_ui_collection_list(void *data, Evas_Object *obj, void *event_info);
404void test_efl_ui_collection_grid(void *data, Evas_Object *obj, void *event_info); 403void test_efl_ui_collection_grid(void *data, Evas_Object *obj, void *event_info);
@@ -909,7 +908,7 @@ add_tests:
909 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table", test_ui_table); 908 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table", test_ui_table);
910 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear); 909 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear);
911 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static); 910 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static);
912 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Layout", test_ui_relative_layout); 911 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Container", test_ui_relative_container);
913 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection List", test_efl_ui_collection_list); 912 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection List", test_efl_ui_collection_list);
914 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection Grid", test_efl_ui_collection_grid); 913 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection Grid", test_efl_ui_collection_grid);
915 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection_View", test_efl_ui_collection_view); 914 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection_View", test_efl_ui_collection_view);
@@ -1211,7 +1210,6 @@ add_tests:
1211 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis); 1210 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis);
1212 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors); 1211 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors);
1213 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji); 1212 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji);
1214 ADD_TEST(NULL, "Text", "Label Variation Sequnece", test_label_variation_sequence);
1215 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath); 1213 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath);
1216 1214
1217 //------------------------------// 1215 //------------------------------//
diff --git a/src/bin/elementary/test_efl_anim_alpha.c b/src/bin/elementary/test_efl_anim_alpha.c
index d75733f..b364319 100644
--- a/src/bin/elementary/test_efl_anim_alpha.c
+++ b/src/bin/elementary/test_efl_anim_alpha.c
@@ -7,31 +7,38 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *show_anim; 8 Efl_Canvas_Animation *show_anim;
9 Efl_Canvas_Animation *hide_anim; 9 Efl_Canvas_Animation *hide_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Eina_Bool is_btn_visible; 12 Eina_Bool is_btn_visible;
13} App_Data; 13} App_Data;
14 14
15static void 15static void
16_anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 16_anim_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
17{ 17{
18 printf("Animation has been started!\n"); 18 Eo *anim = event->info;
19}
20 19
21static void 20 if (anim)
22_anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 21 {
23{ 22 printf("Animation has been started!\n");
24 printf("Animation has been ended!\n"); 23 }
24 else
25 {
26 printf("Animation has been ended!\n");
27 }
25} 28}
26 29
27static void 30static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 31_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 32{
30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 33 double *progress = event->info;
31 double progress = event_running->progress; 34 printf("Animation is running! Current progress(%lf)\n", *progress);
32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 35}
34 36
37EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
38 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
39 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
40)
41
35static void 42static void
36_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 43_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
37{ 44{
@@ -42,18 +49,17 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
42 if (ad->is_btn_visible) 49 if (ad->is_btn_visible)
43 { 50 {
44 //Create Animation Object from Animation 51 //Create Animation Object from Animation
45 efl_animation_player_animation_set(ad->anim_obj, ad->show_anim); 52 efl_canvas_object_animation_start(ad->button, ad->show_anim, 1.0, 0.0);
46 efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0"); 53 efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0");
47 } 54 }
48 else 55 else
49 { 56 {
50 //Create Animation Object from Animation 57 //Create Animation Object from Animation
51 efl_animation_player_animation_set(ad->anim_obj, ad->hide_anim); 58 efl_canvas_object_animation_start(ad->button, ad->hide_anim, 1.0, 0.0);
52 efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0"); 59 efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0");
53 } 60 }
54 61
55 //Let Animation Object start animation 62 //Let Animation Object start animation
56 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
57} 63}
58 64
59static void 65static void
@@ -81,6 +87,7 @@ test_efl_anim_alpha(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
81 evas_object_resize(btn, 200, 200); 87 evas_object_resize(btn, 200, 200);
82 evas_object_move(btn, 100, 50); 88 evas_object_move(btn, 100, 50);
83 evas_object_show(btn); 89 evas_object_show(btn);
90 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
84 91
85 //Show Animation 92 //Show Animation
86 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 93 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
@@ -97,16 +104,8 @@ test_efl_anim_alpha(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
97 //Initialize App Data 104 //Initialize App Data
98 ad->show_anim = show_anim; 105 ad->show_anim = show_anim;
99 ad->hide_anim = hide_anim; 106 ad->hide_anim = hide_anim;
100 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
101 efl_animation_player_target_set(efl_added, btn));
102
103 //Register callback called when animation starts
104 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
105 //Register callback called when animation ends
106 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
107 //Register callback called while animation is executed
108 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
109 ad->is_btn_visible = EINA_TRUE; 107 ad->is_btn_visible = EINA_TRUE;
108 ad->button = btn;
110 109
111 //Button to start animation 110 //Button to start animation
112 Evas_Object *btn2 = elm_button_add(win); 111 Evas_Object *btn2 = elm_button_add(win);
diff --git a/src/bin/elementary/test_efl_anim_group_parallel.c b/src/bin/elementary/test_efl_anim_group_parallel.c
index 6283e22..ed319e5 100644
--- a/src/bin/elementary/test_efl_anim_group_parallel.c
+++ b/src/bin/elementary/test_efl_anim_group_parallel.c
@@ -7,32 +7,38 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *parallel_show_anim; 8 Efl_Canvas_Animation *parallel_show_anim;
9 Efl_Canvas_Animation *parallel_hide_anim; 9 Efl_Canvas_Animation *parallel_hide_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Eina_Bool is_btn_visible; 12 Eina_Bool is_btn_visible;
13} App_Data; 13} App_Data;
14 14
15static void 15static void
16_anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 16_anim_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
17{ 17{
18 printf("Animation has been started!\n"); 18 Eo *anim = event->info;
19}
20
21static void
22_anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
23{
24 printf("Animation has been ended!\n");
25 19
20 if (anim)
21 {
22 printf("Animation has been started!\n");
23 }
24 else
25 {
26 printf("Animation has been ended!\n");
27 }
26} 28}
27 29
28static void 30static void
29_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 31_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
30{ 32{
31 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 33 double *progress = event->info;
32 double progress = event_running->progress; 34 printf("Animation is running! Current progress(%lf)\n", *progress);
33 printf("Animation is running! Current progress(%lf)\n", progress);
34} 35}
35 36
37EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
38 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
39 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
40)
41
36static void 42static void
37_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 43_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
38{ 44{
@@ -43,18 +49,16 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
43 if (ad->is_btn_visible) 49 if (ad->is_btn_visible)
44 { 50 {
45 //Create Animation Object from Animation 51 //Create Animation Object from Animation
46 efl_animation_player_animation_set(ad->anim_obj, ad->parallel_show_anim); 52 efl_canvas_object_animation_start(ad->button, ad->parallel_show_anim, 1.0, 0.0);
47 efl_text_set(obj, "Start Parallel Group Animation to hide button"); 53 efl_text_set(obj, "Start Parallel Group Animation to hide button");
48 } 54 }
49 else 55 else
50 { 56 {
51 //Create Animation Object from Animation 57 //Create Animation Object from Animation
52 efl_animation_player_animation_set(ad->anim_obj, ad->parallel_hide_anim); 58 efl_canvas_object_animation_start(ad->button, ad->parallel_hide_anim, 1.0, 0.0);
53 efl_text_set(obj, "Start Parallel Group Animation to show button"); 59 efl_text_set(obj, "Start Parallel Group Animation to show button");
54 } 60 }
55 61
56 //Let Animation Object start animation
57 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
58} 62}
59 63
60static void 64static void
@@ -82,7 +86,7 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
82 evas_object_resize(btn, 150, 150); 86 evas_object_resize(btn, 150, 150);
83 evas_object_move(btn, 125, 100); 87 evas_object_move(btn, 125, 100);
84 evas_object_show(btn); 88 evas_object_show(btn);
85 89 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
86 90
87 //Show Animation 91 //Show Animation
88 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 92 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
@@ -90,11 +94,11 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
90 94
91 //Rotate from 45 to 0 degrees Animation 95 //Rotate from 45 to 0 degrees Animation
92 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 96 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win);
93 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, 0.5, 0.5); 97 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, EINA_VECTOR2(0.5, 0.5));
94 98
95 //Scale Animation to zoom out 99 //Scale Animation to zoom out
96 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 100 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win);
97 efl_animation_scale_set(scale_half_anim, 2.0, 2.0, 1.0, 1.0, NULL, 0.5, 0.5); 101 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 102
99 //Show Parallel Group Animation 103 //Show Parallel Group Animation
100 Efl_Canvas_Animation *parallel_show_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS, win); 104 Efl_Canvas_Animation *parallel_show_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS, win);
@@ -113,11 +117,11 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
113 117
114 //Rotate from 0 to 45 degrees Animation 118 //Rotate from 0 to 45 degrees Animation
115 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 119 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win);
116 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, 0.5, 0.5); 120 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5));
117 121
118 //Scale Animation to zoom in 122 //Scale Animation to zoom in
119 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 123 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win);
120 efl_animation_scale_set(scale_double_anim, 1.0, 1.0, 2.0, 2.0, NULL, 0.5, 0.5); 124 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));
121 125
122 //Hide Parallel Group Animation 126 //Hide Parallel Group Animation
123 Efl_Canvas_Animation *parallel_hide_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS, win); 127 Efl_Canvas_Animation *parallel_hide_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS, win);
@@ -133,15 +137,7 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
133 //Initialize App Data 137 //Initialize App Data
134 ad->parallel_show_anim = parallel_show_anim; 138 ad->parallel_show_anim = parallel_show_anim;
135 ad->parallel_hide_anim = parallel_hide_anim; 139 ad->parallel_hide_anim = parallel_hide_anim;
136 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, 140 ad->button = btn;
137 efl_animation_player_target_set(efl_added, btn));
138
139 //Register callback called when animation starts
140 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
141 //Register callback called when animation ends
142 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL);
143 //Register callback called while animation is executed
144 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
145 141
146 ad->is_btn_visible = EINA_TRUE; 142 ad->is_btn_visible = EINA_TRUE;
147 143
diff --git a/src/bin/elementary/test_efl_anim_group_sequential.c b/src/bin/elementary/test_efl_anim_group_sequential.c
index 3488149..37b4e53 100644
--- a/src/bin/elementary/test_efl_anim_group_sequential.c
+++ b/src/bin/elementary/test_efl_anim_group_sequential.c
@@ -7,31 +7,38 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *sequential_show_anim; 8 Efl_Canvas_Animation *sequential_show_anim;
9 Efl_Canvas_Animation *sequential_hide_anim; 9 Efl_Canvas_Animation *sequential_hide_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Eina_Bool is_btn_visible; 12 Eina_Bool is_btn_visible;
13} App_Data; 13} App_Data;
14 14
15static void 15static void
16_anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 16_anim_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
17{ 17{
18 printf("Animation has been started!\n"); 18 Eo *anim = event->info;
19}
20 19
21static void 20 if (anim)
22_anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 21 {
23{ 22 printf("Animation has been started!\n");
24 printf("Animation has been ended!\n"); 23 }
24 else
25 {
26 printf("Animation has been ended!\n");
27 }
25} 28}
26 29
27static void 30static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 31_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 32{
30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 33 double *progress = event->info;
31 double progress = event_running->progress; 34 printf("Animation is running! Current progress(%lf)\n", *progress);
32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 35}
34 36
37EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
38 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
39 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
40)
41
35static void 42static void
36_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 43_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
37{ 44{
@@ -42,18 +49,15 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
42 if (ad->is_btn_visible) 49 if (ad->is_btn_visible)
43 { 50 {
44 //Create Animation Object from Animation 51 //Create Animation Object from Animation
45 efl_animation_player_animation_set(ad->anim_obj, ad->sequential_show_anim); 52 efl_canvas_object_animation_start(ad->button, ad->sequential_show_anim, 1.0, 0.0);
46 efl_text_set(obj, "Start Sequential Group Animation to hide button"); 53 efl_text_set(obj, "Start Sequential Group Animation to hide button");
47 } 54 }
48 else 55 else
49 { 56 {
50 //Create Animation Object from Animation 57 //Create Animation Object from Animation
51 efl_animation_player_animation_set(ad->anim_obj, ad->sequential_hide_anim); 58 efl_canvas_object_animation_start(ad->button, ad->sequential_hide_anim, 1.0, 0.0);
52 efl_text_set(obj, "Start Sequential Group Animation to show button"); 59 efl_text_set(obj, "Start Sequential Group Animation to show button");
53 } 60 }
54
55 //Let Animation Object start animation
56 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
57} 61}
58 62
59static void 63static void
@@ -81,16 +85,17 @@ test_efl_anim_group_sequential(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
81 evas_object_resize(btn, 150, 150); 85 evas_object_resize(btn, 150, 150);
82 evas_object_move(btn, 125, 100); 86 evas_object_move(btn, 125, 100);
83 evas_object_show(btn); 87 evas_object_show(btn);
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
84 89
85 90
86 /* Animations to hide button */ 91 /* Animations to hide button */
87 //Rotate from 0 to 45 degrees Animation 92 //Rotate from 0 to 45 degrees Animation
88 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 93 Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win);
89 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, 0.5, 0.5); 94 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5));
90 95
91 //Scale Animation to zoom in 96 //Scale Animation to zoom in
92 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 97 Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win);
93 efl_animation_scale_set(scale_double_anim, 1.0, 1.0, 2.0, 2.0, NULL, 0.5, 0.5); 98 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));
94 99
95 //Hide Animation 100 //Hide Animation
96 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 101 Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
@@ -115,12 +120,12 @@ test_efl_anim_group_sequential(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
115 120
116 //Scale Animation to zoom out 121 //Scale Animation to zoom out
117 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); 122 Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win);
118 efl_animation_scale_set(scale_half_anim, 2.0, 2.0, 1.0, 1.0, NULL, 0.5, 0.5); 123 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));
119 efl_animation_duration_set(scale_half_anim, 1.0); 124 efl_animation_duration_set(scale_half_anim, 1.0);
120 125
121 //Rotate from 45 to 0 degrees Animation 126 //Rotate from 45 to 0 degrees Animation
122 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); 127 Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win);
123 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, 0.5, 0.5); 128 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, EINA_VECTOR2(0.5, 0.5));
124 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 129 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
125 130
126 //Show Sequential Group Animation 131 //Show Sequential Group Animation
@@ -138,15 +143,7 @@ test_efl_anim_group_sequential(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
138 //Initialize App Data 143 //Initialize App Data
139 ad->sequential_show_anim = sequential_show_anim; 144 ad->sequential_show_anim = sequential_show_anim;
140 ad->sequential_hide_anim = sequential_hide_anim; 145 ad->sequential_hide_anim = sequential_hide_anim;
141 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, 146 ad->button = btn;
142 efl_animation_player_target_set(efl_added, btn));
143
144 //Register callback called when animation starts
145 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
146 //Register callback called when animation ends
147 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL);
148 //Register callback called while animation is executed
149 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
150 147
151 ad->is_btn_visible = EINA_TRUE; 148 ad->is_btn_visible = EINA_TRUE;
152 149
diff --git a/src/bin/elementary/test_efl_anim_interpolator.c b/src/bin/elementary/test_efl_anim_interpolator.c
index be177d7..c5a828f 100644
--- a/src/bin/elementary/test_efl_anim_interpolator.c
+++ b/src/bin/elementary/test_efl_anim_interpolator.c
@@ -13,7 +13,7 @@
13typedef struct _App_Data 13typedef struct _App_Data
14{ 14{
15 Efl_Canvas_Animation *anim[INTERP_NUM]; 15 Efl_Canvas_Animation *anim[INTERP_NUM];
16 Efl_Canvas_Animation_Player *anim_obj[INTERP_NUM]; 16 Efl_Ui_Button *btns[INTERP_NUM];
17 17
18 Evas_Object *btn[INTERP_NUM]; 18 Evas_Object *btn[INTERP_NUM];
19 Evas_Object *start_all_btn; 19 Evas_Object *start_all_btn;
@@ -33,78 +33,84 @@ _interpolator_create(int index, Evas_Object *win)
33 else if (index == 1) 33 else if (index == 1)
34 { 34 {
35 interp = efl_add(EFL_SINUSOIDAL_INTERPOLATOR_CLASS, win); 35 interp = efl_add(EFL_SINUSOIDAL_INTERPOLATOR_CLASS, win);
36 efl_sinusoidal_interpolator_factor_set(interp, 1.0); 36 efl_sinusoidal_interpolator_slope_set(interp, 1.0);
37 } 37 }
38 else if (index == 2) 38 else if (index == 2)
39 { 39 {
40 interp = efl_add(EFL_DECELERATE_INTERPOLATOR_CLASS, win); 40 interp = efl_add(EFL_DECELERATE_INTERPOLATOR_CLASS, win);
41 efl_decelerate_interpolator_factor_set(interp, 1.0); 41 efl_decelerate_interpolator_slope_set(interp, 1.0);
42 } 42 }
43 else if (index == 3) 43 else if (index == 3)
44 { 44 {
45 interp = efl_add(EFL_ACCELERATE_INTERPOLATOR_CLASS, win); 45 interp = efl_add(EFL_ACCELERATE_INTERPOLATOR_CLASS, win);
46 efl_accelerate_interpolator_factor_set(interp, 1.0); 46 efl_accelerate_interpolator_slope_set(interp, 1.0);
47 } 47 }
48 else if (index == 4) 48 else if (index == 4)
49 { 49 {
50 interp = efl_add(EFL_DIVISOR_INTERPOLATOR_CLASS, win); 50 interp = efl_add(EFL_DIVISOR_INTERPOLATOR_CLASS, win);
51 efl_divisor_interpolator_factors_set(interp, 1.0, 1.0); 51 efl_divisor_interpolator_divisor_set(interp, 1.0);
52 efl_divisor_interpolator_power_set(interp, 1);
52 } 53 }
53 else if (index == 5) 54 else if (index == 5)
54 { 55 {
55 interp = efl_add(EFL_BOUNCE_INTERPOLATOR_CLASS, win); 56 interp = efl_add(EFL_BOUNCE_INTERPOLATOR_CLASS, win);
56 efl_bounce_interpolator_factors_set(interp, 1.0, 1.0); 57 efl_bounce_interpolator_rigidness_set(interp, 1.0);
58 efl_bounce_interpolator_bounces_set(interp, 1);
57 } 59 }
58 else if (index == 6) 60 else if (index == 6)
59 { 61 {
60 interp = efl_add(EFL_SPRING_INTERPOLATOR_CLASS, win); 62 interp = efl_add(EFL_SPRING_INTERPOLATOR_CLASS, win);
61 efl_spring_interpolator_factors_set(interp, 1.0, 1.0); 63 efl_spring_interpolator_decay_set(interp, 1.0);
64 efl_spring_interpolator_oscillations_set(interp, 1);
62 } 65 }
63 66
64 return interp; 67 return interp;
65} 68}
66 69
67static void 70static void
68_anim_started_cb(void *data, const Efl_Event *event EINA_UNUSED) 71_anim_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
69{ 72{
73 Eo *anim = event->info;
70 App_Data *ad = data; 74 App_Data *ad = data;
71 75
72 printf("Animation has been started!\n"); 76 if (anim)
73 77 {
74 ad->running_anim_cnt++; 78 printf("Animation has been started!\n");
75} 79 ad->running_anim_cnt++;
76 80 }
77static void 81 else
78_anim_ended_cb(void *data, const Efl_Event *event) 82 {
79{ 83 int i;
80 App_Data *ad = data;
81 int i;
82
83 printf("Animation has been ended!\n");
84 84
85 ad->running_anim_cnt--; 85 printf("Animation has been ended!\n");
86 ad->running_anim_cnt--;
86 87
87 for (i = 0; i < INTERP_NUM; i++) 88 for (i = 0; i < INTERP_NUM; i++)
88 {
89 if (ad->anim_obj[i] == event->object)
90 { 89 {
91 elm_object_disabled_set(ad->btn[i], EINA_FALSE); 90 if (ad->btns[i] == event->object)
92 break; 91 {
92 elm_object_disabled_set(ad->btn[i], EINA_FALSE);
93 break;
94 }
93 } 95 }
94 }
95 96
96 if (ad->running_anim_cnt == 0) 97 if (ad->running_anim_cnt == 0)
97 elm_object_disabled_set(ad->start_all_btn, EINA_FALSE); 98 elm_object_disabled_set(ad->start_all_btn, EINA_FALSE);
99 }
98} 100}
99 101
100static void 102static void
101_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 103_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
102{ 104{
103 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 105 double *progress = event->info;
104 double progress = event_running->progress; 106 printf("Animation is running! Current progress(%lf)\n", *progress);
105 printf("Animation is running! Current progress(%lf)\n", progress);
106} 107}
107 108
109EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
110 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
111 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
112)
113
108static void 114static void
109_anim_start(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 115_anim_start(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
110{ 116{
@@ -113,7 +119,7 @@ _anim_start(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
113 int index = (uintptr_t)evas_object_data_get(obj, "index"); 119 int index = (uintptr_t)evas_object_data_get(obj, "index");
114 120
115 //Let Animation Object start animation 121 //Let Animation Object start animation
116 efl_player_playing_set(ad->anim_obj[index], EINA_TRUE); 122 efl_canvas_object_animation_start(ad->btns[index], ad->anim[index], 1.0, 0.0);
117 123
118 elm_object_disabled_set(obj, EINA_TRUE); 124 elm_object_disabled_set(obj, EINA_TRUE);
119 elm_object_disabled_set(ad->start_all_btn, EINA_TRUE); 125 elm_object_disabled_set(ad->start_all_btn, EINA_TRUE);
@@ -128,7 +134,7 @@ _anim_start_all(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
128 for (i = 0; i < INTERP_NUM; i++) 134 for (i = 0; i < INTERP_NUM; i++)
129 { 135 {
130 //Let Animation Object start animation 136 //Let Animation Object start animation
131 efl_player_playing_set(ad->anim_obj[i], EINA_TRUE); 137 efl_canvas_object_animation_start(ad->btns[i], ad->anim[i], 1.0, 0.0);
132 elm_object_disabled_set(ad->btn[i], EINA_TRUE); 138 elm_object_disabled_set(ad->btn[i], EINA_TRUE);
133 } 139 }
134 140
@@ -144,9 +150,7 @@ _win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
144 for (i = 0; i < INTERP_NUM; i++) 150 for (i = 0; i < INTERP_NUM; i++)
145 { 151 {
146 //Unregister callback called when window deletes 152 //Unregister callback called when window deletes
147 efl_event_callback_del(ad->anim_obj[i], 153 efl_event_callback_array_del(ad->btns[i], animation_stats_cb(), ad);
148 EFL_ANIMATION_PLAYER_EVENT_ENDED,
149 _anim_ended_cb, ad);
150 } 154 }
151 155
152 free(ad); 156 free(ad);
@@ -199,7 +203,7 @@ test_efl_anim_interpolator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
199 203
200 Efl_Canvas_Animation *anim = 204 Efl_Canvas_Animation *anim =
201 efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); 205 efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win);
202 efl_animation_translate_set(anim, 0, 0, (WIN_W - BTN_W), 0); 206 efl_animation_translate_set(anim, EINA_POSITION2D(0, 0), EINA_POSITION2D((WIN_W - BTN_W), 0));
203 efl_animation_duration_set(anim, 2.0); 207 efl_animation_duration_set(anim, 2.0);
204 efl_animation_final_state_keep_set(anim, EINA_FALSE); 208 efl_animation_final_state_keep_set(anim, EINA_FALSE);
205 209
@@ -208,23 +212,8 @@ test_efl_anim_interpolator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
208 ad->anim[i] = anim; 212 ad->anim[i] = anim;
209 213
210 //Create Animation Object from Animation 214 //Create Animation Object from Animation
211 Efl_Canvas_Animation_Player *anim_obj = 215 ad->btns[i] = btn;
212 efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, 216 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
213 efl_animation_player_animation_set(efl_added, anim),
214 efl_animation_player_target_set(efl_added, btn));
215 ad->anim_obj[i] = anim_obj;
216
217 //Register callback called when animation starts
218 efl_event_callback_add(anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED,
219 _anim_started_cb, ad);
220
221 //Register callback called when animation ends
222 efl_event_callback_add(anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED,
223 _anim_ended_cb, ad);
224
225 //Register callback called while animation is executed
226 efl_event_callback_add(anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING,
227 _anim_running_cb, NULL);
228 } 217 }
229 218
230 ad->running_anim_cnt = 0; 219 ad->running_anim_cnt = 0;
diff --git a/src/bin/elementary/test_efl_anim_pause.c b/src/bin/elementary/test_efl_anim_pause.c
index 3730db3..92d4b3e 100644
--- a/src/bin/elementary/test_efl_anim_pause.c
+++ b/src/bin/elementary/test_efl_anim_pause.c
@@ -7,7 +7,7 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *show_anim; 8 Efl_Canvas_Animation *show_anim;
9 Efl_Canvas_Animation *hide_anim; 9 Efl_Canvas_Animation *hide_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Evas_Object *pause_btn; 12 Evas_Object *pause_btn;
13 13
@@ -16,60 +16,54 @@ typedef struct _App_Data
16} App_Data; 16} App_Data;
17 17
18static void 18static void
19_anim_started_cb(void *data, const Efl_Event *event EINA_UNUSED) 19_anim_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
20{ 20{
21 Eo *anim = event->info;
21 App_Data *ad = data; 22 App_Data *ad = data;
22 23
23 printf("Animation has been started!\n"); 24 if (anim)
24 25 {
25 elm_object_disabled_set(ad->pause_btn, EINA_FALSE); 26 printf("Animation has been started!\n");
26} 27 elm_object_disabled_set(ad->pause_btn, EINA_FALSE);
27 28 }
28static void 29 else
29_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED) 30 {
30{ 31 printf("Animation has been ended!\n");
31 App_Data *ad = data; 32 elm_object_disabled_set(ad->pause_btn, EINA_TRUE);
32 33 }
33 printf("Animation has been ended!\n");
34
35 elm_object_disabled_set(ad->pause_btn, EINA_TRUE);
36} 34}
37 35
38static void 36static void
39_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 37_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
40{ 38{
41 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 39 double *progress = event->info;
42 double progress = event_running->progress; 40 printf("Animation is running! Current progress(%lf)\n", *progress);
43 printf("Animation is running! Current progress(%lf)\n", progress);
44} 41}
45 42
43EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
44 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
45 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
46)
47
46static void 48static void
47_start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 49_start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
48{ 50{
49 App_Data *ad = data; 51 App_Data *ad = data;
50 52
51 if (ad->anim_obj)
52 {
53 ad->is_anim_paused = EINA_FALSE;
54 elm_object_text_set(ad->pause_btn, "Pause Animation");
55 }
56
57 ad->is_btn_visible = !(ad->is_btn_visible); 53 ad->is_btn_visible = !(ad->is_btn_visible);
58 54
59 if (ad->is_btn_visible) 55 if (ad->is_btn_visible)
60 { 56 {
61 //Create Animation Object from Animation 57 //Create Animation Object from Animation
62 efl_animation_player_animation_set(ad->anim_obj, ad->show_anim); 58 efl_canvas_object_animation_start(ad->button, ad->show_anim, 1.0, 0.0);
63 efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0"); 59 efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0");
64 } 60 }
65 else 61 else
66 { 62 {
67 //Create Animation Object from Animation 63 //Create Animation Object from Animation
68 efl_animation_player_animation_set(ad->anim_obj, ad->hide_anim); 64 efl_canvas_object_animation_start(ad->button, ad->hide_anim, 1.0, 0.0);
69 efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0"); 65 efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0");
70 } 66 }
71 //Let Animation Object start animation
72 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
73} 67}
74 68
75static void 69static void
@@ -82,13 +76,13 @@ _pause_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
82 if (ad->is_anim_paused) 76 if (ad->is_anim_paused)
83 { 77 {
84 //Pause animation 78 //Pause animation
85 efl_player_paused_set(ad->anim_obj, EINA_TRUE); 79 efl_canvas_object_animation_pause_set(ad->button, EINA_TRUE);
86 elm_object_text_set(obj, "Resume Animation"); 80 elm_object_text_set(obj, "Resume Animation");
87 } 81 }
88 else 82 else
89 { 83 {
90 //Resume animation 84 //Resume animation
91 efl_player_paused_set(ad->anim_obj, EINA_FALSE); 85 efl_canvas_object_animation_pause_set(ad->button, EINA_FALSE);
92 elm_object_text_set(obj, "Pause Animation"); 86 elm_object_text_set(obj, "Pause Animation");
93 } 87 }
94} 88}
@@ -118,6 +112,7 @@ test_efl_anim_pause(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
118 evas_object_resize(btn, 200, 200); 112 evas_object_resize(btn, 200, 200);
119 evas_object_move(btn, 100, 50); 113 evas_object_move(btn, 100, 50);
120 evas_object_show(btn); 114 evas_object_show(btn);
115 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
121 116
122 //Show Animation 117 //Show Animation
123 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 118 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
@@ -152,25 +147,14 @@ test_efl_anim_pause(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
152 //Pause button becomes enabled only if the animation is started 147 //Pause button becomes enabled only if the animation is started
153 elm_object_disabled_set(pause_btn, EINA_TRUE); 148 elm_object_disabled_set(pause_btn, EINA_TRUE);
154 149
155
156 //Initialize App Data 150 //Initialize App Data
157 ad->show_anim = show_anim; 151 ad->show_anim = show_anim;
158 ad->hide_anim = hide_anim; 152 ad->hide_anim = hide_anim;
159 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, 153 ad->button = btn;
160 efl_animation_player_target_set(efl_added, btn));
161
162 //Register callback called when animation starts
163 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, ad);
164 //Register callback called when animation ends
165 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
166 //Register callback called while animation is executed
167 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
168
169 ad->pause_btn = pause_btn; 154 ad->pause_btn = pause_btn;
170 ad->is_btn_visible = EINA_TRUE; 155 ad->is_btn_visible = EINA_TRUE;
171 ad->is_anim_paused = EINA_FALSE; 156 ad->is_anim_paused = EINA_FALSE;
172 157
173
174 evas_object_resize(win, 400, 450); 158 evas_object_resize(win, 400, 450);
175 evas_object_show(win); 159 evas_object_show(win);
176} 160}
diff --git a/src/bin/elementary/test_efl_anim_repeat.c b/src/bin/elementary/test_efl_anim_repeat.c
index 55bf98c..0f72882 100644
--- a/src/bin/elementary/test_efl_anim_repeat.c
+++ b/src/bin/elementary/test_efl_anim_repeat.c
@@ -7,7 +7,7 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *show_anim; 8 Efl_Canvas_Animation *show_anim;
9 Efl_Canvas_Animation *hide_anim; 9 Efl_Canvas_Animation *hide_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Evas_Object *start_btn; 12 Evas_Object *start_btn;
13 Evas_Object *repeat_count_spin; 13 Evas_Object *repeat_count_spin;
@@ -27,46 +27,50 @@ _anim_repeat_mode_get(Evas_Object *spinner)
27 return EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE; 27 return EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE;
28} 28}
29 29
30static void
31_anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
32{
33 printf("Animation has been started!\n");
34}
35 30
36static void 31static void
37_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED) 32_anim_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
38{ 33{
34 Eo *anim = event->info;
39 App_Data *ad = data; 35 App_Data *ad = data;
40 36
41 printf("Animation has been ended!\n"); 37 if (anim)
42 38 {
43 Efl_Canvas_Animation_Repeat_Mode repeat_mode = _anim_repeat_mode_get(ad->repeat_mode_spin); 39 printf("Animation has been started!\n");
44 if (repeat_mode == EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE) 40 }
41 else
45 { 42 {
46 int repeat_count = elm_spinner_value_get(ad->repeat_count_spin); 43 printf("Animation has been ended!\n");
47 if (repeat_count % 2 == 1) 44 Efl_Canvas_Animation_Repeat_Mode repeat_mode = _anim_repeat_mode_get(ad->repeat_mode_spin);
45 if (repeat_mode == EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE)
48 { 46 {
49 ad->is_btn_visible = !(ad->is_btn_visible); 47 int repeat_count = elm_spinner_value_get(ad->repeat_count_spin);
50 48 if (repeat_count % 2 == 1)
51 if (ad->is_btn_visible) 49 {
52 elm_object_text_set(ad->start_btn, "Start Alpha Animation from 1.0 to 0.0"); 50 ad->is_btn_visible = !(ad->is_btn_visible);
53 else 51 if (ad->is_btn_visible)
54 elm_object_text_set(ad->start_btn, "Start Alpha Animation from 0.0 to 1.0"); 52 elm_object_text_set(ad->start_btn, "Start Alpha Animation from 1.0 to 0.0");
53 else
54 elm_object_text_set(ad->start_btn, "Start Alpha Animation from 0.0 to 1.0");
55 }
55 } 56 }
57 elm_object_disabled_set(ad->repeat_count_spin, EINA_FALSE);
58 elm_object_disabled_set(ad->repeat_mode_spin, EINA_FALSE);
56 } 59 }
57
58 elm_object_disabled_set(ad->repeat_count_spin, EINA_FALSE);
59 elm_object_disabled_set(ad->repeat_mode_spin, EINA_FALSE);
60} 60}
61 61
62static void 62static void
63_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 63_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
64{ 64{
65 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 65 double *progress = event->info;
66 double progress = event_running->progress; 66 printf("Animation is running! Current progress(%lf)\n", *progress);
67 printf("Animation is running! Current progress(%lf)\n", progress);
68} 67}
69 68
69EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
70 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
71 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
72)
73
70static void 74static void
71_start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 75_start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
72{ 76{
@@ -89,7 +93,7 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
89 efl_animation_repeat_mode_set(ad->show_anim, repeat_mode); 93 efl_animation_repeat_mode_set(ad->show_anim, repeat_mode);
90 94
91 //Create Animation Object from Animation 95 //Create Animation Object from Animation
92 efl_animation_player_animation_set(ad->anim_obj, ad->show_anim); 96 efl_canvas_object_animation_start(ad->button, ad->show_anim, 1.0, 0.0);
93 efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0"); 97 efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0");
94 } 98 }
95 else 99 else
@@ -101,12 +105,9 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
101 efl_animation_repeat_mode_set(ad->hide_anim, repeat_mode); 105 efl_animation_repeat_mode_set(ad->hide_anim, repeat_mode);
102 106
103 //Create Animation Object from Animation 107 //Create Animation Object from Animation
104 efl_animation_player_animation_set(ad->anim_obj, ad->hide_anim); 108 efl_canvas_object_animation_start(ad->button, ad->hide_anim, 1.0, 0.0);
105 efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0"); 109 efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0");
106 } 110 }
107
108 //Let Animation Object start animation
109 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
110} 111}
111 112
112static void 113static void
@@ -133,6 +134,7 @@ test_efl_anim_repeat(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
133 evas_object_resize(btn, 200, 200); 134 evas_object_resize(btn, 200, 200);
134 evas_object_move(btn, 100, 50); 135 evas_object_move(btn, 100, 50);
135 evas_object_show(btn); 136 evas_object_show(btn);
137 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
136 138
137 //Show Animation 139 //Show Animation
138 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); 140 Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
@@ -178,24 +180,14 @@ test_efl_anim_repeat(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
178 evas_object_move(repeat_mode_spin, 100, 400); 180 evas_object_move(repeat_mode_spin, 100, 400);
179 evas_object_show(repeat_mode_spin); 181 evas_object_show(repeat_mode_spin);
180 182
181
182 //Initialize App Data 183 //Initialize App Data
183 ad->show_anim = show_anim; 184 ad->show_anim = show_anim;
184 ad->hide_anim = hide_anim; 185 ad->hide_anim = hide_anim;
185 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
186 efl_animation_player_target_set(efl_added, btn));
187 //Register callback called when animation starts
188 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
189 //Register callback called when animation ends
190 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
191 //Register callback called while animation is executed
192 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
193
194 ad->start_btn = start_btn; 186 ad->start_btn = start_btn;
195 ad->repeat_count_spin = repeat_count_spin; 187 ad->repeat_count_spin = repeat_count_spin;
196 ad->repeat_mode_spin = repeat_mode_spin; 188 ad->repeat_mode_spin = repeat_mode_spin;
197 ad->is_btn_visible = EINA_TRUE; 189 ad->is_btn_visible = EINA_TRUE;
198 190 ad->button = btn;
199 191
200 evas_object_resize(win, 400, 500); 192 evas_object_resize(win, 400, 500);
201 evas_object_show(win); 193 evas_object_show(win);
diff --git a/src/bin/elementary/test_efl_anim_rotate.c b/src/bin/elementary/test_efl_anim_rotate.c
index 10df8ca..437d015 100644
--- a/src/bin/elementary/test_efl_anim_rotate.c
+++ b/src/bin/elementary/test_efl_anim_rotate.c
@@ -7,31 +7,38 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *cw_45_degrees_anim; 8 Efl_Canvas_Animation *cw_45_degrees_anim;
9 Efl_Canvas_Animation *ccw_45_degrees_anim; 9 Efl_Canvas_Animation *ccw_45_degrees_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Eina_Bool is_btn_rotated; 12 Eina_Bool is_btn_rotated;
13} App_Data; 13} App_Data;
14 14
15static void 15static void
16_anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 16_anim_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
17{ 17{
18 printf("Animation has been started!\n"); 18 Eo *anim = event->info;
19}
20 19
21static void 20 if (anim)
22_anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 21 {
23{ 22 printf("Animation has been started!\n");
24 printf("Animation has been ended!\n"); 23 }
24 else
25 {
26 printf("Animation has been ended!\n");
27 }
25} 28}
26 29
27static void 30static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 31_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 32{
30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 33 double *progress = event->info;
31 double progress = event_running->progress; 34 printf("Animation is running! Current progress(%lf)\n", *progress);
32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 35}
34 36
37EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
38 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
39 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
40)
41
35static void 42static void
36_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 43_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
37{ 44{
@@ -42,18 +49,15 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
42 if (ad->is_btn_rotated) 49 if (ad->is_btn_rotated)
43 { 50 {
44 //Create Animation Object from Animation 51 //Create Animation Object from Animation
45 efl_animation_player_animation_set(ad->anim_obj, ad->cw_45_degrees_anim); 52 efl_canvas_object_animation_start(ad->button, ad->cw_45_degrees_anim, 1.0, 0.0);
46 efl_text_set(obj, "Start Rotate Animation from 45 to 0 degrees"); 53 efl_text_set(obj, "Start Rotate Animation from 45 to 0 degrees");
47 } 54 }
48 else 55 else
49 { 56 {
50 //Create Animation Object from Animation 57 //Create Animation Object from Animation
51 efl_animation_player_animation_set(ad->anim_obj, ad->ccw_45_degrees_anim); 58 efl_canvas_object_animation_start(ad->button, ad->ccw_45_degrees_anim, 1.0, 0.0);
52 efl_text_set(obj, "Start Rotate Animation from 0 to 45 degrees"); 59 efl_text_set(obj, "Start Rotate Animation from 0 to 45 degrees");
53 } 60 }
54
55 //Let Animation Object start animation
56 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
57} 61}
58 62
59static void 63static void
@@ -81,32 +85,24 @@ test_efl_anim_rotate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
81 evas_object_resize(btn, 150, 150); 85 evas_object_resize(btn, 150, 150);
82 evas_object_move(btn, 125, 100); 86 evas_object_move(btn, 125, 100);
83 evas_object_show(btn); 87 evas_object_show(btn);
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
84 89
85 //Rotate from 0 to 45 degrees Animation 90 //Rotate from 0 to 45 degrees Animation
86 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_ANIMATION_ROTATE_CLASS, win);
87 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0,NULL, 0.5, 0.5); 92 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5));
88 efl_animation_duration_set(cw_45_degrees_anim, 1.0); 93 efl_animation_duration_set(cw_45_degrees_anim, 1.0);
89 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);
90 95
91 //Rotate from 45 to 0 degrees Animation 96 //Rotate from 45 to 0 degrees Animation
92 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_ANIMATION_ROTATE_CLASS, win);
93 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, 0.5, 0.5); 98 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, EINA_VECTOR2(0.5, 0.5));
94 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 99 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
95 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);
96 101
97 //Initialize App Data 102 //Initialize App Data
98 ad->cw_45_degrees_anim = cw_45_degrees_anim; 103 ad->cw_45_degrees_anim = cw_45_degrees_anim;
99 ad->ccw_45_degrees_anim = ccw_45_degrees_anim; 104 ad->ccw_45_degrees_anim = ccw_45_degrees_anim;
100 105 ad->button = btn;
101 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
102 efl_animation_player_target_set(efl_added, btn));
103 //Register callback called when animation starts
104 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
105 //Register callback called when animation ends
106 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL);
107 //Register callback called while animation is executed
108 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
109
110 ad->is_btn_rotated = EINA_FALSE; 106 ad->is_btn_rotated = EINA_FALSE;
111 107
112 //Button to start animation 108 //Button to start animation
@@ -140,6 +136,7 @@ test_efl_anim_rotate_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
140 evas_object_resize(btn, 150, 150); 136 evas_object_resize(btn, 150, 150);
141 evas_object_move(btn, 125, 100); 137 evas_object_move(btn, 125, 100);
142 evas_object_show(btn); 138 evas_object_show(btn);
139 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
143 140
144 //Pivot to be center of the rotation 141 //Pivot to be center of the rotation
145 Evas_Object *pivot = elm_button_add(win); 142 Evas_Object *pivot = elm_button_add(win);
@@ -151,31 +148,21 @@ test_efl_anim_rotate_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
151 148
152 //Rotate from 0 to 45 degrees Animation 149 //Rotate from 0 to 45 degrees Animation
153 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_ANIMATION_ROTATE_CLASS, win);
154 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, pivot, 0.5, 0.5); 151 efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, pivot, EINA_VECTOR2(0.5, 0.5));
155 efl_animation_duration_set(cw_45_degrees_anim, 1.0); 152 efl_animation_duration_set(cw_45_degrees_anim, 1.0);
156 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);
157 154
158 //Rotate from 45 to 0 degrees Animation 155 //Rotate from 45 to 0 degrees Animation
159 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_ANIMATION_ROTATE_CLASS, win);
160 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, pivot, 0.5, 0.5); 157 efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, pivot, EINA_VECTOR2(0.5, 0.5));
161 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 158 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
162 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);
163 160
164 //Initialize App Data 161 //Initialize App Data
165 ad->cw_45_degrees_anim = cw_45_degrees_anim; 162 ad->cw_45_degrees_anim = cw_45_degrees_anim;
166 ad->ccw_45_degrees_anim = ccw_45_degrees_anim; 163 ad->ccw_45_degrees_anim = ccw_45_degrees_anim;
167 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
168 efl_animation_player_target_set(efl_added, btn));
169
170 //Register callback called when animation starts
171 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
172
173 //Register callback called when animation ends
174 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL);
175
176 //Register callback called while animation is executed
177 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
178 ad->is_btn_rotated = EINA_FALSE; 164 ad->is_btn_rotated = EINA_FALSE;
165 ad->button = btn;
179 166
180 //Button to start animation 167 //Button to start animation
181 Evas_Object *btn2 = elm_button_add(win); 168 Evas_Object *btn2 = elm_button_add(win);
@@ -208,6 +195,7 @@ test_efl_anim_rotate_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
208 evas_object_resize(btn, 150, 150); 195 evas_object_resize(btn, 150, 150);
209 evas_object_move(btn, 125, 100); 196 evas_object_move(btn, 125, 100);
210 evas_object_show(btn); 197 evas_object_show(btn);
198 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
211 199
212 //Absolute coordinate (0, 0) to be center of the rotation 200 //Absolute coordinate (0, 0) to be center of the rotation
213 Evas_Object *abs_center = elm_button_add(win); 201 Evas_Object *abs_center = elm_button_add(win);
@@ -219,30 +207,21 @@ test_efl_anim_rotate_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
219 207
220 //Rotate from 0 to 45 degrees Animation 208 //Rotate from 0 to 45 degrees Animation
221 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_ANIMATION_ROTATE_CLASS, win);
222 efl_animation_rotate_absolute_set(cw_45_degrees_anim, 0.0, 45.0, 0, 0); 210 efl_animation_rotate_absolute_set(cw_45_degrees_anim, 0.0, 45.0, EINA_POSITION2D(0, 0));
223 efl_animation_duration_set(cw_45_degrees_anim, 1.0); 211 efl_animation_duration_set(cw_45_degrees_anim, 1.0);
224 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);
225 213
226 //Rotate from 45 to 0 degrees Animation 214 //Rotate from 45 to 0 degrees Animation
227 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_ANIMATION_ROTATE_CLASS, win);
228 efl_animation_rotate_absolute_set(ccw_45_degrees_anim, 45.0, 0.0, 0, 0); 216 efl_animation_rotate_absolute_set(ccw_45_degrees_anim, 45.0, 0.0, EINA_POSITION2D(0, 0));
229 efl_animation_duration_set(ccw_45_degrees_anim, 1.0); 217 efl_animation_duration_set(ccw_45_degrees_anim, 1.0);
230 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);
231 219
232 //Initialize App Data 220 //Initialize App Data
233 ad->cw_45_degrees_anim = cw_45_degrees_anim; 221 ad->cw_45_degrees_anim = cw_45_degrees_anim;
234 ad->ccw_45_degrees_anim = ccw_45_degrees_anim; 222 ad->ccw_45_degrees_anim = ccw_45_degrees_anim;
235 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
236 efl_animation_player_target_set(efl_added, btn));
237
238 //Register callback called when animation starts
239 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
240 //Register callback called when animation ends
241 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL);
242 //Register callback called while animation is executed
243 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
244
245 ad->is_btn_rotated = EINA_FALSE; 223 ad->is_btn_rotated = EINA_FALSE;
224 ad->button = btn;
246 225
247 //Button to start animation 226 //Button to start animation
248 Evas_Object *btn2 = elm_button_add(win); 227 Evas_Object *btn2 = elm_button_add(win);
diff --git a/src/bin/elementary/test_efl_anim_scale.c b/src/bin/elementary/test_efl_anim_scale.c
index 5e5f9ab..93ac1f7 100644
--- a/src/bin/elementary/test_efl_anim_scale.c
+++ b/src/bin/elementary/test_efl_anim_scale.c
@@ -7,31 +7,38 @@ typedef struct _App_Data
7{ 7{
8 Efl_Canvas_Animation *scale_double_anim; 8 Efl_Canvas_Animation *scale_double_anim;
9 Efl_Canvas_Animation *scale_half_anim; 9 Efl_Canvas_Animation *scale_half_anim;
10 Efl_Canvas_Animation_Player *anim_obj; 10 Elm_Button *button;
11 11
12 Eina_Bool is_btn_scaled; 12 Eina_Bool is_btn_scaled;
13} App_Data; 13} App_Data;
14 14
15static void 15static void
16_anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 16_anim_changed_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
17{ 17{
18 printf("Animation has been started!\n"); 18 Eo *anim = event->info;
19}
20 19
21static void 20 if (anim)
22_anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 21 {
23{ 22 printf("Animation has been started!\n");
24 printf("Animation has been ended!\n"); 23 }
24 else
25 {
26 printf("Animation has been ended!\n");
27 }
25} 28}
26 29
27static void 30static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 31_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 32{
30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; 33 double *progress = event->info;
31 double progress = event_running->progress; 34 printf("Animation is running! Current progress(%lf)\n", *progress);
32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 35}
34 36
37EFL_CALLBACKS_ARRAY_DEFINE(animation_stats_cb,
38 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_CHANGED, _anim_changed_cb },
39 {EFL_CANVAS_OBJECT_ANIMATION_EVENT_ANIMATION_PROGRESS_UPDATED, _anim_running_cb },
40)
41
35static void 42static void
36_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 43_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
37{ 44{
@@ -42,18 +49,15 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
42 if (ad->is_btn_scaled) 49 if (ad->is_btn_scaled)
43 { 50 {
44 //Create Animation Object from Animation 51 //Create Animation Object from Animation
45 efl_animation_player_animation_set(ad->anim_obj, ad->scale_double_anim); 52 efl_canvas_object_animation_start(ad->button, ad->scale_double_anim, 1.0, 0.0);
46 efl_text_set(obj, "Start Scale Animation to zoom out"); 53 efl_text_set(obj, "Start Scale Animation to zoom out");
47 } 54 }
48 else 55 else
49 { 56 {
50 //Create Animation Object from Animation 57 //Create Animation Object from Animation
51 efl_animation_player_animation_set(ad->anim_obj, ad->scale_half_anim); 58 efl_canvas_object_animation_start(ad->button, ad->scale_half_anim, 1.0, 0.0);
52 efl_text_set(obj, "Start Scale Animation to zoom in"); 59 efl_text_set(obj, "Start Scale Animation to zoom in");
53 } 60 }
54
55 //Let Animation Object start animation
56 efl_player_playing_set(ad->anim_obj, EINA_TRUE);
57} 61}
58 62
59static void 63static void
@@ -81,35 +85,25 @@ test_efl_anim_scale(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
81 evas_object_resize(btn, 150, 150); 85 evas_object_resize(btn, 150, 150);
82 evas_object_move(btn, 125, 100); 86 evas_object_move(btn, 125, 100);
83 evas_object_show(btn); 87 evas_object_show(btn);
88 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
84 89
85 //Scale Animation to zoom in 90 //Scale Animation to zoom in
86 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_ANIMATION_SCALE_CLASS, win);
87 efl_animation_scale_set(scale_double_anim, 1.0, 1.0, 2.0, 2.0, NULL, 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));
88 efl_animation_duration_set(scale_double_anim, 1.0); 93 efl_animation_duration_set(scale_double_anim, 1.0);
89 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); 94 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE);
90 95
91 //Scale Animation to zoom out 96 //Scale Animation to zoom out
92 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_ANIMATION_SCALE_CLASS, win);
93 efl_animation_scale_set(scale_half_anim, 2.0, 2.0, 1.0, 1.0, NULL, 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));
94 efl_animation_duration_set(scale_half_anim, 1.0); 99 efl_animation_duration_set(scale_half_anim, 1.0);
95 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); 100 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE);
96 101
97 //Initialize App Data 102 //Initialize App Data
98 ad->scale_double_anim = scale_double_anim; 103 ad->scale_double_anim = scale_double_anim;
99 ad->scale_half_anim = scale_half_anim; 104 ad->scale_half_anim = scale_half_anim;
100 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
101 efl_animation_player_target_set(efl_added, btn));
102
103 //Register callback called when animation starts
104 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
105
106 //Register callback called when animation ends
107 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
108
109 //Register callback called while animation is executed
110 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
111
112 ad->is_btn_scaled = EINA_FALSE; 105 ad->is_btn_scaled = EINA_FALSE;
106 ad->button = btn;
113 107
114 //Button to start animation 108 //Button to start animation
115 Evas_Object *btn2 = elm_button_add(win); 109 Evas_Object *btn2 = elm_button_add(win);
@@ -142,6 +136,7 @@ test_efl_anim_scale_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
142 evas_object_resize(btn, 150, 150); 136 evas_object_resize(btn, 150, 150);
143 evas_object_move(btn, 125, 100); 137 evas_object_move(btn, 125, 100);
144 evas_object_show(btn); 138 evas_object_show(btn);
139 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
145 140
146 //Pivot to be center of the scaling 141 //Pivot to be center of the scaling
147 Evas_Object *pivot = elm_button_add(win); 142 Evas_Object *pivot = elm_button_add(win);
@@ -153,28 +148,20 @@ test_efl_anim_scale_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
153 148
154 //Scale Animation to zoom in 149 //Scale Animation to zoom in
155 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_ANIMATION_SCALE_CLASS, win);
156 efl_animation_scale_set(scale_double_anim, 1.0, 1.0, 2.0, 2.0, pivot, 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));
157 efl_animation_duration_set(scale_double_anim, 1.0); 152 efl_animation_duration_set(scale_double_anim, 1.0);
158 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); 153 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE);
159 154
160 //Scale Animation to zoom out 155 //Scale Animation to zoom out
161 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_ANIMATION_SCALE_CLASS, win);
162 efl_animation_scale_set(scale_half_anim, 2.0, 2.0, 1.0, 1.0, pivot, 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));
163 efl_animation_duration_set(scale_half_anim, 1.0); 158 efl_animation_duration_set(scale_half_anim, 1.0);
164 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); 159 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE);
165 160
166 //Initialize App Data 161 //Initialize App Data
167 ad->scale_double_anim = scale_double_anim; 162 ad->scale_double_anim = scale_double_anim;
168 ad->scale_half_anim = scale_half_anim; 163 ad->scale_half_anim = scale_half_anim;
169 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, 164 ad->button = btn;
170 efl_animation_player_target_set(efl_added, btn));
171 //Register callback called when animation starts
172 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
173 //Register callback called when animation ends
174 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
175 //Register callback called while animation is executed
176 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
177
178 ad->is_btn_scaled = EINA_FALSE; 165 ad->is_btn_scaled = EINA_FALSE;
179 166
180 //Button to start animation 167 //Button to start animation
@@ -208,6 +195,7 @@ test_efl_anim_scale_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
208 evas_object_resize(btn, 150, 150); 195 evas_object_resize(btn, 150, 150);
209 evas_object_move(btn, 125, 100); 196 evas_object_move(btn, 125, 100);
210 evas_object_show(btn); 197 evas_object_show(btn);
198 efl_event_callback_array_add(btn, animation_stats_cb(), ad);
211 199
212 //Absolute coordinate (0, 0) to be center of the scaling 200 //Absolute coordinate (0, 0) to be center of the scaling
213 Evas_Object *abs_center = elm_button_add(win); 201 Evas_Object *abs_center = elm_button_add(win);
@@ -219,28 +207,20 @@ test_efl_anim_scale_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
219 207
220 //Scale Animation to zoom in 208 //Scale Animation to zoom in
221 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_ANIMATION_SCALE_CLASS, win);
222 efl_animation_scale_absolute_set(scale_double_anim, 1.0, 1.0, 2.0, 2.0, 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));
223 efl_animation_duration_set(scale_double_anim, 1.0); 211 efl_animation_duration_set(scale_double_anim, 1.0);
224 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); 212 efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE);
225 213
226 //Scale Animation to zoom out 214 //Scale Animation to zoom out
227 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_ANIMATION_SCALE_CLASS, win);
228 efl_animation_scale_absolute_set(scale_half_anim, 2.0, 2.0, 1.0, 1.0, 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));
229 efl_animation_duration_set(scale_half_anim, 1.0); 217 efl_animation_duration_set(scale_half_anim, 1.0);
230 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); 218 efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE);
231 219
232 //Initialize App Data 220 //Initialize App Data
233 ad->scale_double_anim = scale_double_anim; 221 ad->scale_double_anim = scale_double_anim;
234 ad->scale_half_anim = scale_half_anim; 222 ad->scale_half_anim = scale_half_anim;
235 ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, 223 ad->button = btn;
236 efl_animation_player_target_set(efl_added, btn));
237 //Register callback called when animation starts
238 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
239 //Register callback called when animation ends
240 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
241 //Register callback called while animation is executed
242 efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
243
244 ad->is_btn_scaled = EINA_FALSE; 224 ad->is_btn_scaled = EINA_FALSE;
245 225
246 //Button to start animation 226 //Button to start animation
diff --git a/src/bin/elementary/test_efl_anim_start_delay.c b/src/bin/elementary/test_efl_anim_start_delay.c
index e3c7b25..6ef663b 100644
--- a/src/bin/elementary/test_efl_anim_start_delay.c
+++ b/src/bin/elementary/test_efl_anim_start_delay.c
@@ -7,7 +7,7 @@ typedef struct _App_Data
7{