summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2020-01-13 14:24:30 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2020-01-13 14:31:15 +0100
commit914fa2fd7c197c8baf57e4601f0a506d2b68f373 (patch)
tree028f50cd6d6fe5d95da03926ad0a92be6a8ed7f4
parentb2829634fcca60b39c63d7b620cb1ae331b5f602 (diff)
efl_gesture: rename Efl.Gesture.Events to Efl.Canvas.Gesture_Events
Summary: Since the current Efl.Gesture.Events has canvas gesture events only, Efl.Gesture.Events should be renamed to Efl.Canvas.Gesture_Events. If other types of gesture events are newlly required later, which are not based on canvas, then class Efl.XXX.Gesture_Events is required to be introduced. Reviewers: CHAN, segfaultxavi, bu5hm4n, zmike Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11073
-rw-r--r--src/lib/evas/Efl_Canvas.h2
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.c2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_events.eo (renamed from src/lib/evas/gesture/efl_gesture_events.eo)10
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_flick.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_momentum.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_tap.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_zoom.eo2
-rw-r--r--src/lib/evas/gesture/meson.build2
15 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index 1963aa2a55..dc3f61a43b 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -121,7 +121,7 @@ extern "C" {
121#include <gesture/efl_canvas_gesture_tap.eo.h> 121#include <gesture/efl_canvas_gesture_tap.eo.h>
122#include <gesture/efl_canvas_gesture_triple_tap.eo.h> 122#include <gesture/efl_canvas_gesture_triple_tap.eo.h>
123#include <gesture/efl_canvas_gesture_zoom.eo.h> 123#include <gesture/efl_canvas_gesture_zoom.eo.h>
124#include <gesture/efl_gesture_events.eo.h> 124#include <gesture/efl_canvas_gesture_events.eo.h>
125 125
126 126
127#ifdef __cplusplus 127#ifdef __cplusplus
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 1137426a30..d9cc99932c 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -214,7 +214,7 @@ struct _Efl_Canvas_Object_Animation_Event
214#include "gesture/efl_canvas_gesture_recognizer_flick.eo.h" 214#include "gesture/efl_canvas_gesture_recognizer_flick.eo.h"
215#include "gesture/efl_canvas_gesture_recognizer_zoom.eo.h" 215#include "gesture/efl_canvas_gesture_recognizer_zoom.eo.h"
216#include "gesture/efl_canvas_gesture_manager.eo.h" 216#include "gesture/efl_canvas_gesture_manager.eo.h"
217#include "gesture/efl_gesture_events.eo.h" 217#include "gesture/efl_canvas_gesture_events.eo.h"
218 218
219#include "canvas/efl_canvas_object.eo.h" 219#include "canvas/efl_canvas_object.eo.h"
220#include "canvas/efl_canvas_object_animation.eo.h" 220#include "canvas/efl_canvas_object_animation.eo.h"
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index dbee3db658..bc02e56197 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -11,7 +11,7 @@ struct Efl.Event_Animator_Tick {
11 11
12abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, 12abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack,
13 Efl.Input.Interface, Efl.Gfx.Hint, 13 Efl.Input.Interface, Efl.Gfx.Hint,
14 Efl.Gfx.Mapping, Efl.Canvas.Pointer, Efl.Gesture.Events, Efl.Canvas.Object_Animation 14 Efl.Gfx.Mapping, Efl.Canvas.Pointer, Efl.Canvas.Gesture_Events, Efl.Canvas.Object_Animation
15{ 15{
16 [[Efl canvas object abstract class 16 [[Efl canvas object abstract class
17 17
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.c b/src/lib/evas/gesture/efl_canvas_gesture.c
index 0cc7f8d423..26f279f557 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture.c
@@ -49,4 +49,4 @@ _efl_canvas_gesture_timestamp_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_
49} 49}
50 50
51#include "efl_canvas_gesture.eo.c" 51#include "efl_canvas_gesture.eo.c"
52#include "efl_gesture_events.eo.c" 52#include "efl_canvas_gesture_events.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index eaced25ad8..22334e245e 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -1,5 +1,5 @@
1import efl_canvas_gesture_types; 1import efl_canvas_gesture_types;
2parse efl_gesture_events; 2parse efl_canvas_gesture_events;
3 3
4abstract @beta Efl.Canvas.Gesture extends Efl.Object 4abstract @beta Efl.Canvas.Gesture extends Efl.Object
5{ 5{
@@ -11,7 +11,7 @@ abstract @beta Efl.Canvas.Gesture extends Efl.Object
11 11
12 Typically this class is not used directly, instead, some sub-class of it (like 12 Typically this class is not used directly, instead, some sub-class of it (like
13 @Efl.Canvas.Gesture_Tap or @Efl.Canvas.Gesture_Zoom) is retrieved from gesture events 13 @Efl.Canvas.Gesture_Tap or @Efl.Canvas.Gesture_Zoom) is retrieved from gesture events
14 (like @[Efl.Gesture.Events.gesture,tap] or @[Efl.Gesture.Events.gesture,zoom]). 14 (like @[Efl.Canvas.Gesture_Events.gesture,tap] or @[Efl.Canvas.Gesture_Events.gesture,zoom]).
15 ]] 15 ]]
16 c_prefix: efl_gesture; 16 c_prefix: efl_gesture;
17 methods { 17 methods {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo
index c154500244..ee52aedbc5 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Double_Tap extends Efl.Canvas.Gesture
2{ 2{
3 [[Double-tap gesture class holding state information. 3 [[Double-tap gesture class holding state information.
4 See @Efl.Canvas.Gesture to see what this state is and 4 See @Efl.Canvas.Gesture to see what this state is and
5 @[Efl.Gesture.Events.gesture,double_tap] for a description of the Double-tap gesture. 5 @[Efl.Canvas.Gesture_Events.gesture,double_tap] for a description of the Double-tap gesture.
6 6
7 Application developers receive these objects inside a gesture event and do not typically need to create their own. 7 Application developers receive these objects inside a gesture event and do not typically need to create their own.
8 ]] 8 ]]
diff --git a/src/lib/evas/gesture/efl_gesture_events.eo b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
index df0a473d0b..9344d71edb 100644
--- a/src/lib/evas/gesture/efl_gesture_events.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
@@ -1,4 +1,4 @@
1interface @beta Efl.Gesture.Events 1interface @beta Efl.Canvas.Gesture_Events
2{ 2{
3 [[Interface for objects capable of emitting gesture events, like @Efl.Canvas.Object. 3 [[Interface for objects capable of emitting gesture events, like @Efl.Canvas.Object.
4 ]] 4 ]]
@@ -6,25 +6,25 @@ interface @beta Efl.Gesture.Events
6 events { 6 events {
7 gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected. 7 gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected.
8 A Tap gesture consists of a touch of the screen (or click of the mouse) quickly followed by 8 A Tap gesture consists of a touch of the screen (or click of the mouse) quickly followed by
9 a release. If the release happens too late a @[Efl.Gesture.Events.gesture,long_tap] event will be 9 a release. If the release happens too late a @[Efl.Canvas.Gesture_Events.gesture,long_tap] event will be
10 emitted instead. 10 emitted instead.
11 ]] 11 ]]
12 12
13 gesture,double_tap: Efl.Canvas.Gesture_Double_Tap; [[Emitted when a Double-tap gesture has been detected. 13 gesture,double_tap: Efl.Canvas.Gesture_Double_Tap; [[Emitted when a Double-tap gesture has been detected.
14 A Double-tap gesture consists of two taps on the screen (or clicks of the mouse) in quick 14 A Double-tap gesture consists of two taps on the screen (or clicks of the mouse) in quick
15 succession. If the second one is delayed for too long they will be detected as two independent 15 succession. If the second one is delayed for too long they will be detected as two independent
16 @[Efl.Gesture.Events.gesture,tap] events. 16 @[Efl.Canvas.Gesture_Events.gesture,tap] events.
17 ]] 17 ]]
18 18
19 gesture,triple_tap: Efl.Canvas.Gesture_Triple_Tap; [[Emitted when a Triple-tap gesture has been detected. 19 gesture,triple_tap: Efl.Canvas.Gesture_Triple_Tap; [[Emitted when a Triple-tap gesture has been detected.
20 A Triple-tap gesture consists of three taps on the screen (or clicks of the mouse) in quick 20 A Triple-tap gesture consists of three taps on the screen (or clicks of the mouse) in quick
21 succession. If any of them is delayed for too long they will be detected as independent 21 succession. If any of them is delayed for too long they will be detected as independent
22 @[Efl.Gesture.Events.gesture,tap] or @[Efl.Gesture.Events.gesture,double_tap] events. 22 @[Efl.Canvas.Gesture_Events.gesture,tap] or @[Efl.Canvas.Gesture_Events.gesture,double_tap] events.
23 ]] 23 ]]
24 24
25 gesture,long_tap: Efl.Canvas.Gesture_Long_Tap; [[Emitted when a Long-tap gesture has been detected. 25 gesture,long_tap: Efl.Canvas.Gesture_Long_Tap; [[Emitted when a Long-tap gesture has been detected.
26 A Long-tap gesture consists of a touch of the screen (or click of the mouse) followed by a release 26 A Long-tap gesture consists of a touch of the screen (or click of the mouse) followed by a release
27 after some time. If the release happens too quickly a @[Efl.Gesture.Events.gesture,tap] event will be 27 after some time. If the release happens too quickly a @[Efl.Canvas.Gesture_Events.gesture,tap] event will be
28 emitted instead. 28 emitted instead.
29 ]] 29 ]]
30 30
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_flick.eo b/src/lib/evas/gesture/efl_canvas_gesture_flick.eo
index 125a538cc9..bec2f127c8 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_flick.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_flick.eo
@@ -4,7 +4,7 @@ class @beta Efl.Canvas.Gesture_Flick extends Efl.Canvas.Gesture
4{ 4{
5 [[Flick gesture class holding state information. 5 [[Flick gesture class holding state information.
6 See @Efl.Canvas.Gesture to see what this state is and 6 See @Efl.Canvas.Gesture to see what this state is and
7 @[Efl.Gesture.Events.gesture,flick] for a description of the Flick gesture. 7 @[Efl.Canvas.Gesture_Events.gesture,flick] for a description of the Flick gesture.
8 8
9 Application developers receive these objects inside a gesture event and do not typically need to create their own. 9 Application developers receive these objects inside a gesture event and do not typically need to create their own.
10 ]] 10 ]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
index c182697a58..022e3bd4ae 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Long_Tap extends Efl.Canvas.Gesture
2{ 2{
3 [[Long-tap gesture class holding state information. 3 [[Long-tap gesture class holding state information.
4 See @Efl.Canvas.Gesture to see what this state is and 4 See @Efl.Canvas.Gesture to see what this state is and
5 @[Efl.Gesture.Events.gesture,long_tap] for a description of the Long-tap gesture. 5 @[Efl.Canvas.Gesture_Events.gesture,long_tap] for a description of the Long-tap gesture.
6 6
7 Application developers receive these objects inside a gesture event and do not typically need to create their own. 7 Application developers receive these objects inside a gesture event and do not typically need to create their own.
8 ]] 8 ]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo b/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo
index df0e0720db..d3bd578e1c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo
@@ -4,7 +4,7 @@ class @beta Efl.Canvas.Gesture_Momentum extends Efl.Canvas.Gesture
4{ 4{
5 [[Momentum gesture class holding state information. 5 [[Momentum gesture class holding state information.
6 See @Efl.Canvas.Gesture to see what this state is and 6 See @Efl.Canvas.Gesture to see what this state is and
7 @[Efl.Gesture.Events.gesture,momentum] for a description of the Momentum gesture. 7 @[Efl.Canvas.Gesture_Events.gesture,momentum] for a description of the Momentum gesture.
8 8
9 Application developers receive these objects inside a gesture event and do not typically need to create their own. 9 Application developers receive these objects inside a gesture event and do not typically need to create their own.
10 ]] 10 ]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_private.h b/src/lib/evas/gesture/efl_canvas_gesture_private.h
index a835c3093d..fb24d0f549 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_private.h
+++ b/src/lib/evas/gesture/efl_canvas_gesture_private.h
@@ -4,7 +4,7 @@
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_private.h" 5#include "evas_private.h"
6 6
7#include "efl_gesture_events.eo.h" 7#include "efl_canvas_gesture_events.eo.h"
8 8
9#include <Ecore.h> 9#include <Ecore.h>
10 10
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
index 238c487e61..b3cda6d447 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Tap extends Efl.Canvas.Gesture
2{ 2{
3 [[Tap gesture class holding state information. 3 [[Tap gesture class holding state information.
4 See @Efl.Canvas.Gesture to see what this state is and 4 See @Efl.Canvas.Gesture to see what this state is and
5 @[Efl.Gesture.Events.gesture,tap] for a description of the Tap gesture. 5 @[Efl.Canvas.Gesture_Events.gesture,tap] for a description of the Tap gesture.
6 6
7 Application developers receive these objects inside a gesture event and do not typically need to create their own. 7 Application developers receive these objects inside a gesture event and do not typically need to create their own.
8 ]] 8 ]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo
index a85bf6b671..f58a9912ae 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Triple_Tap extends Efl.Canvas.Gesture
2{ 2{
3 [[Triple-tap gesture class holding state information. 3 [[Triple-tap gesture class holding state information.
4 See @Efl.Canvas.Gesture to see what this state is and 4 See @Efl.Canvas.Gesture to see what this state is and
5 @[Efl.Gesture.Events.gesture,triple_tap] for a description of the Triple-tap gesture. 5 @[Efl.Canvas.Gesture_Events.gesture,triple_tap] for a description of the Triple-tap gesture.
6 6
7 Application developers receive these objects inside a gesture event and do not typically need to create their own. 7 Application developers receive these objects inside a gesture event and do not typically need to create their own.
8 ]] 8 ]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo b/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo
index 4620225db0..1471a9401c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Zoom extends Efl.Canvas.Gesture
2{ 2{
3 [[Zoom gesture class holding state information. 3 [[Zoom gesture class holding state information.
4 See @Efl.Canvas.Gesture to see what this state is and 4 See @Efl.Canvas.Gesture to see what this state is and
5 @[Efl.Gesture.Events.gesture,zoom] for a description of the Zoom gesture. 5 @[Efl.Canvas.Gesture_Events.gesture,zoom] for a description of the Zoom gesture.
6 6
7 Application developers receive these objects inside a gesture event and do not typically need to create their own. 7 Application developers receive these objects inside a gesture event and do not typically need to create their own.
8 ]] 8 ]]
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index 9854e6f94d..7838efdc9d 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -17,7 +17,7 @@ pub_eo_files = [
17 'efl_canvas_gesture_recognizer_flick.eo', 17 'efl_canvas_gesture_recognizer_flick.eo',
18 'efl_canvas_gesture_recognizer_zoom.eo', 18 'efl_canvas_gesture_recognizer_zoom.eo',
19 'efl_canvas_gesture_manager.eo', 19 'efl_canvas_gesture_manager.eo',
20 'efl_gesture_events.eo' 20 'efl_canvas_gesture_events.eo'
21] 21]
22 22
23evas_gesture_eo_files = pub_eo_files 23evas_gesture_eo_files = pub_eo_files