summaryrefslogtreecommitdiff
path: root/src/lib/efl
diff options
context:
space:
mode:
authorJunsuChoi <jsuya.choi@samsung.com>2019-01-29 19:16:34 +0900
committerHermet Park <hermetpark@gmail.com>2019-01-29 19:16:34 +0900
commit09ce84bbadc3fb21311e5dbff7c09d74a2ef4d55 (patch)
tree0b59f27df3df616acb591ff62eb42788eecaad95 /src/lib/efl
parent391339332ff91f6a304e87be4a23421d895866f2 (diff)
efl_gfx_image_animation_controller: Rename '*.Image_Animation_*' to '*.Frame_*'
Summary: Efl.Gfx.Image_Animation_Controller name refers to the control of an animatable image. However, the method we use is closer to controlling the frame. We can change the name to Efl.Gfx.Frame_Controller and enhance the functionality of the frame control. Test Plan: N/A Reviewers: Hermet Reviewed By: Hermet Subscribers: segfaultxavi, cedric, woohyun, #reviewers, Jaehyun_Cho, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7769
Diffstat (limited to '')
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_frame_controller.eo (renamed from src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo)57
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/meson.build2
4 files changed, 31 insertions, 34 deletions
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 46bd09b4ee..f4c79916ab 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -86,7 +86,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
86#include "interfaces/efl_duplicate.eo.h" 86#include "interfaces/efl_duplicate.eo.h"
87#include "interfaces/efl_file.eo.h" 87#include "interfaces/efl_file.eo.h"
88#include "interfaces/efl_gfx_image.eo.h" 88#include "interfaces/efl_gfx_image.eo.h"
89#include "interfaces/efl_gfx_image_animation_controller.eo.h" 89#include "interfaces/efl_gfx_frame_controller.eo.h"
90#include "interfaces/efl_gfx_image_load_controller.eo.h" 90#include "interfaces/efl_gfx_image_load_controller.eo.h"
91#include "interfaces/efl_part.eo.h" 91#include "interfaces/efl_part.eo.h"
92#include "interfaces/efl_playable.eo.h" 92#include "interfaces/efl_playable.eo.h"
@@ -227,7 +227,7 @@ EAPI Eina_Future *efl_ui_view_factory_create_with_event(Efl_Ui_Factory *factory,
227#include "interfaces/efl_gfx_fill.eo.legacy.h" 227#include "interfaces/efl_gfx_fill.eo.legacy.h"
228#include "interfaces/efl_gfx_entity.eo.legacy.h" 228#include "interfaces/efl_gfx_entity.eo.legacy.h"
229#include "interfaces/efl_gfx_image.eo.legacy.h" 229#include "interfaces/efl_gfx_image.eo.legacy.h"
230#include "interfaces/efl_gfx_image_animation_controller.eo.legacy.h" 230#include "interfaces/efl_gfx_frame_controller.eo.legacy.h"
231#include "interfaces/efl_input_device.eo.legacy.h" 231#include "interfaces/efl_input_device.eo.legacy.h"
232#include "interfaces/efl_text_types.eot.h" 232#include "interfaces/efl_text_types.eot.h"
233#endif 233#endif
diff --git a/src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
index ef11fe6d4d..dcb54f6eea 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
@@ -1,42 +1,39 @@
1/* FIXME: invalid type from evas/emile! */ 1/* FIXME: invalid type from evas/emile! */
2/* type @extern Evas.Animated_Loop_Hint: int; */ 2/* type @extern Evas.Animated_Loop_Hint: int; */
3 3
4enum Efl.Gfx.Image_Animation_Controller_Loop_Hint { 4enum Efl.Gfx.Frame_Controller_Loop_Hint {
5 [[Image animation loop modes]] 5 [[Frame loop modes]]
6 none = 0, [[No looping order specified.]] 6 none = 0, [[No looping order specified.]]
7 loop = 1, [[Standard loop: 1->2->3->1->2->3->1]] 7 loop = 1, [[Standard loop: 1->2->3->1->2->3->1]]
8 pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]] 8 pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]]
9} 9}
10 10
11/* FIXME: rename to Efl.Gfx.Image_Animation_Controller when eo/eolian are fixed */ 11interface Efl.Gfx.Frame_Controller
12
13interface Efl.Gfx.Image_Animation_Controller
14{ 12{
15 [[Efl animated image interface]] 13 [[Efl frame controller of frame based animated object interface.]]
16 eo_prefix: efl_gfx_image;
17 14
18 methods { 15 methods {
19 @property animated { 16 @property animated {
20 get { 17 get {
21 [[Check if an image can be animated (has multiple frames). 18 [[Check if an object can be animated (has multiple frames).
22 19
23 This will be $true for animated Gif files for instance but $false 20 This will be $true for animated object for instance but $false
24 for still images. 21 for still image.
25 22
26 @since 1.1 23 @since 1.1
27 ]] 24 ]]
28 } 25 }
29 values { 26 values {
30 is_animated: bool; [[$true if the image is animated]] 27 is_animated: bool; [[$true if the object is animated]]
31 } 28 }
32 } 29 }
33 @property animated_frame { 30 @property frame {
34 [[Index of the current frame of an animated image. 31 [[Index of the current frame of an animated object.
35 32
36 Ranges from 1 to @.animated_frame_count. Valid only if @.animated. 33 Ranges from 1 to @.frame_count. Valid only if @.animated.
37 ]] 34 ]]
38 set { 35 set {
39 [[Set the frame to current frame of an image object. 36 [[Set the frame to current frame of an animated object.
40 37
41 @since 1.1 38 @since 1.1
42 ]] 39 ]]
@@ -47,43 +44,43 @@ interface Efl.Gfx.Image_Animation_Controller
47 frame_index: int; [[The index of current frame.]] 44 frame_index: int; [[The index of current frame.]]
48 } 45 }
49 } 46 }
50 @property animated_frame_count { 47 @property frame_count {
51 get { 48 get {
52 [[Get the total number of frames of the image, if animated. 49 [[Get the total number of frames of the object, if animated.
53 50
54 Returns -1 if not animated. 51 Returns -1 if not animated.
55 52
56 @since 1.1 53 @since 1.1
57 ]] 54 ]]
58 return: int; [[The number of frames in the animated image.]] 55 return: int; [[The number of frames in the animated object.]]
59 } 56 }
60 } 57 }
61 @property animated_loop_type { 58 @property loop_type {
62 /* FIXME: external type used from evas / emile */ 59 /* FIXME: external type used from evas / emile */
63 get { 60 get {
64 [[Get the kind of looping the image object does. 61 [[Get the kind of looping the animated object does.
65 62
66 This returns the kind of looping the image object wants to do. 63 This returns the kind of looping the animated object wants to do.
67 64
68 If it returns @Efl.Gfx.Image_Animation_Controller_Loop_Hint.loop, you should 65 If it returns @Efl.Gfx.Frame_Controller_Loop_Hint.loop, you should
69 display frames in a sequence like: 1->2->3->1->2->3->1... 66 display frames in a sequence like: 1->2->3->1->2->3->1...
70 67
71 If it returns @Efl.Gfx.Image_Animation_Controller_Loop_Hint.pingpong, it is 68 If it returns @Efl.Gfx.Frame_Controller_Loop_Hint.pingpong, it is
72 better to display frames in a sequence like: 69 better to display frames in a sequence like:
73 1->2->3->2->1->2->3->1... 70 1->2->3->2->1->2->3->1...
74 71
75 The default type is @Efl.Gfx.Image_Animation_Controller_Loop_Hint.loop. 72 The default type is @Efl.Gfx.Frame_Controller_Loop_Hint.loop.
76 73
77 @since 1.1 74 @since 1.1
78 ]] 75 ]]
79 return: Efl.Gfx.Image_Animation_Controller_Loop_Hint; [[Loop type of the image object.]] 76 return: Efl.Gfx.Frame_Controller_Loop_Hint; [[Loop type of the animated object.]]
80 } 77 }
81 } 78 }
82 @property animated_loop_count { 79 @property loop_count {
83 get { 80 get {
84 [[Get the number times the animation of the object loops. 81 [[Get the number times the animation of the object loops.
85 82
86 This returns loop count of image. The loop count is the number 83 This returns loop count of animated object. The loop count is the number
87 of times the animation will play fully from first to last frame 84 of times the animation will play fully from first to last frame
88 until the animation should stop (at the final frame). 85 until the animation should stop (at the final frame).
89 86
@@ -92,10 +89,10 @@ interface Efl.Gfx.Image_Animation_Controller
92 89
93 @since 1.1 90 @since 1.1
94 ]] 91 ]]
95 return: int; [[The number of loop of an animated image object.]] 92 return: int; [[The number of loop of an animated object.]]
96 } 93 }
97 } 94 }
98 @property animated_frame_duration { 95 @property frame_duration {
99 get { 96 get {
100 [[Get the duration of a sequence of frames. 97 [[Get the duration of a sequence of frames.
101 98
@@ -110,7 +107,7 @@ interface Efl.Gfx.Image_Animation_Controller
110 ]] 107 ]]
111 } 108 }
112 keys { 109 keys {
113 start_frame: int; [[The first frame, rangers from 1 to @.animated_frame_count.]] 110 start_frame: int; [[The first frame, rangers from 1 to @.frame_count.]]
114 frame_num: int; [[Number of frames in the sequence, starts from 0.]] 111 frame_num: int; [[Number of frames in the sequence, starts from 0.]]
115 } 112 }
116 values { 113 values {
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 4e6c699950..3e6f983cbd 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -15,7 +15,7 @@
15#include "interfaces/efl_control.eo.c" 15#include "interfaces/efl_control.eo.c"
16#include "interfaces/efl_duplicate.eo.c" 16#include "interfaces/efl_duplicate.eo.c"
17#include "interfaces/efl_gfx_image.eo.c" 17#include "interfaces/efl_gfx_image.eo.c"
18#include "interfaces/efl_gfx_image_animation_controller.eo.c" 18#include "interfaces/efl_gfx_frame_controller.eo.c"
19#include "interfaces/efl_gfx_image_load_controller.eo.c" 19#include "interfaces/efl_gfx_image_load_controller.eo.c"
20#include "interfaces/efl_part.eo.c" 20#include "interfaces/efl_part.eo.c"
21#include "interfaces/efl_playable.eo.c" 21#include "interfaces/efl_playable.eo.c"
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 871375776a..e325bdc15d 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -5,7 +5,7 @@ pub_legacy_eo_files = [
5 'efl_gfx_entity.eo', 5 'efl_gfx_entity.eo',
6 'efl_gfx_color.eo', 6 'efl_gfx_color.eo',
7 'efl_gfx_image.eo', 7 'efl_gfx_image.eo',
8 'efl_gfx_image_animation_controller.eo', 8 'efl_gfx_frame_controller.eo',
9 'efl_input_device.eo', 9 'efl_input_device.eo',
10 'efl_ui_draggable.eo', 10 'efl_ui_draggable.eo',
11 'efl_ui_clickable.eo', 11 'efl_ui_clickable.eo',