xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=914fa2fd7c197c8baf57e4601f0a506d2b68f373
commit 914fa2fd7c197c8baf57e4601f0a506d2b68f373
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Mon Jan 13 14:24:30 2020 +0100
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
---
src/lib/evas/Efl_Canvas.h | 2 +-
src/lib/evas/Evas_Eo.h | 2 +-
src/lib/evas/canvas/efl_canvas_object.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture.c | 2 +-
src/lib/evas/gesture/efl_canvas_gesture.eo | 4 ++--
src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo | 2 +-
.../{efl_gesture_events.eo => efl_canvas_gesture_events.eo} | 10 +++++-----
src/lib/evas/gesture/efl_canvas_gesture_flick.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_momentum.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_private.h | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_tap.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_zoom.eo | 2 +-
src/lib/evas/gesture/meson.build | 2 +-
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" {
#include <gesture/efl_canvas_gesture_tap.eo.h>
#include <gesture/efl_canvas_gesture_triple_tap.eo.h>
#include <gesture/efl_canvas_gesture_zoom.eo.h>
-#include <gesture/efl_gesture_events.eo.h>
+#include <gesture/efl_canvas_gesture_events.eo.h>
#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
#include "gesture/efl_canvas_gesture_recognizer_flick.eo.h"
#include "gesture/efl_canvas_gesture_recognizer_zoom.eo.h"
#include "gesture/efl_canvas_gesture_manager.eo.h"
-#include "gesture/efl_gesture_events.eo.h"
+#include "gesture/efl_canvas_gesture_events.eo.h"
#include "canvas/efl_canvas_object.eo.h"
#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 {
abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements
Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack,
Efl.Input.Interface, Efl.Gfx.Hint,
- Efl.Gfx.Mapping, Efl.Canvas.Pointer,
Efl.Gesture.Events, Efl.Canvas.Object_Animation
+ Efl.Gfx.Mapping, Efl.Canvas.Pointer,
Efl.Canvas.Gesture_Events, Efl.Canvas.Object_Animation
{
[[Efl canvas object abstract class
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_
}
#include "efl_canvas_gesture.eo.c"
-#include "efl_gesture_events.eo.c"
+#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 @@
import efl_canvas_gesture_types;
-parse efl_gesture_events;
+parse efl_canvas_gesture_events;
abstract @beta Efl.Canvas.Gesture extends Efl.Object
{
@@ -11,7 +11,7 @@ abstract @beta Efl.Canvas.Gesture extends Efl.Object
Typically this class is not used directly, instead, some sub-class of it
(like
@Efl.Canvas.Gesture_Tap or @Efl.Canvas.Gesture_Zoom) is retrieved from
gesture events
- (like @[Efl.Gesture.Events.gesture,tap] or
@[Efl.Gesture.Events.gesture,zoom]).
+ (like @[Efl.Canvas.Gesture_Events.gesture,tap] or
@[Efl.Canvas.Gesture_Events.gesture,zoom]).
]]
c_prefix: efl_gesture;
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
{
[[Double-tap gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,double_tap] for a description of the
Double-tap gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,double_tap] for a description of the
Double-tap gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
diff --git a/src/lib/evas/gesture/efl_gesture_events.eo
b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
similarity index 85%
rename from src/lib/evas/gesture/efl_gesture_events.eo
rename to 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 @@
-interface @beta Efl.Gesture.Events
+interface @beta Efl.Canvas.Gesture_Events
{
[[Interface for objects capable of emitting gesture events, like
@Efl.Canvas.Object.
]]
@@ -6,25 +6,25 @@ interface @beta Efl.Gesture.Events
events {
gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has
been detected.
A Tap gesture consists of a touch of the screen (or click of the
mouse) quickly followed by
- a release. If the release happens too late a
@[Efl.Gesture.Events.gesture,long_tap] event will be
+ a release. If the release happens too late a
@[Efl.Canvas.Gesture_Events.gesture,long_tap] event will be
emitted instead.
]]
gesture,double_tap: Efl.Canvas.Gesture_Double_Tap; [[Emitted when a
Double-tap gesture has been detected.
A Double-tap gesture consists of two taps on the screen (or clicks of
the mouse) in quick
succession. If the second one is delayed for too long they will be
detected as two independent
- @[Efl.Gesture.Events.gesture,tap] events.
+ @[Efl.Canvas.Gesture_Events.gesture,tap] events.
]]
gesture,triple_tap: Efl.Canvas.Gesture_Triple_Tap; [[Emitted when a
Triple-tap gesture has been detected.
A Triple-tap gesture consists of three taps on the screen (or clicks
of the mouse) in quick
succession. If any of them is delayed for too long they will be
detected as independent
- @[Efl.Gesture.Events.gesture,tap] or
@[Efl.Gesture.Events.gesture,double_tap] events.
+ @[Efl.Canvas.Gesture_Events.gesture,tap] or
@[Efl.Canvas.Gesture_Events.gesture,double_tap] events.
]]
gesture,long_tap: Efl.Canvas.Gesture_Long_Tap; [[Emitted when a Long-tap
gesture has been detected.
A Long-tap gesture consists of a touch of the screen (or click of the
mouse) followed by a release
- after some time. If the release happens too quickly a
@[Efl.Gesture.Events.gesture,tap] event will be
+ after some time. If the release happens too quickly a
@[Efl.Canvas.Gesture_Events.gesture,tap] event will be
emitted instead.
]]
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
{
[[Flick gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,flick] for a description of the Flick
gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,flick] for a description of the Flick
gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
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
{
[[Long-tap gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,long_tap] for a description of the Long-tap
gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,long_tap] for a description of the
Long-tap gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
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
{
[[Momentum gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,momentum] for a description of the Momentum
gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,momentum] for a description of the
Momentum gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
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 @@
#include "evas_common_private.h"
#include "evas_private.h"
-#include "efl_gesture_events.eo.h"
+#include "efl_canvas_gesture_events.eo.h"
#include <Ecore.h>
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
{
[[Tap gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,tap] for a description of the Tap gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,tap] for a description of the Tap
gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
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
{
[[Triple-tap gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,triple_tap] for a description of the
Triple-tap gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,triple_tap] for a description of the
Triple-tap gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
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
{
[[Zoom gesture class holding state information.
See @Efl.Canvas.Gesture to see what this state is and
- @[Efl.Gesture.Events.gesture,zoom] for a description of the Zoom gesture.
+ @[Efl.Canvas.Gesture_Events.gesture,zoom] for a description of the Zoom
gesture.
Application developers receive these objects inside a gesture event and
do not typically need to create their own.
]]
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 = [
'efl_canvas_gesture_recognizer_flick.eo',
'efl_canvas_gesture_recognizer_zoom.eo',
'efl_canvas_gesture_manager.eo',
- 'efl_gesture_events.eo'
+ 'efl_canvas_gesture_events.eo'
]
evas_gesture_eo_files = pub_eo_files
--
