summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-01-29 14:07:16 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-02-05 10:11:02 +0100
commit501063eb5cc684abf654daf0aefcebf42f386461 (patch)
tree71813fda5d27597e1d1f492e544512295d9832f1 /src/lib/evas
parente002305e4bfd15c9fa3a426b9e21eb8daf02c3e9 (diff)
evas/object: remove weird gesture manager method
these two objects have zero relation, and I don't know why this ever existed Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D11243
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Efl_Canvas.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo6
-rw-r--r--src/lib/evas/canvas/evas_object_main.c9
3 files changed, 2 insertions, 15 deletions
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index 9ef46201bf..3d004c9425 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -58,11 +58,11 @@ extern "C" {
58#include "canvas/efl_input_focus.eo.h" 58#include "canvas/efl_input_focus.eo.h"
59#include "canvas/efl_input_clickable.eo.h" 59#include "canvas/efl_input_clickable.eo.h"
60 60
61#include <canvas/efl_canvas_object.eo.h>
61#include <gesture/efl_canvas_gesture.eo.h> 62#include <gesture/efl_canvas_gesture.eo.h>
62#include <gesture/efl_canvas_gesture_touch.eo.h> 63#include <gesture/efl_canvas_gesture_touch.eo.h>
63#include <gesture/efl_canvas_gesture_recognizer.eo.h> 64#include <gesture/efl_canvas_gesture_recognizer.eo.h>
64#include <gesture/efl_canvas_gesture_manager.eo.h> 65#include <gesture/efl_canvas_gesture_manager.eo.h>
65#include <canvas/efl_canvas_object.eo.h>
66 66
67#include <canvas/efl_canvas_alpha_animation.eo.h> 67#include <canvas/efl_canvas_alpha_animation.eo.h>
68#include <canvas/efl_canvas_animation.eo.h> 68#include <canvas/efl_canvas_animation.eo.h>
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index bc02e56197..890462ca7f 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.Canvas.Gesture_Events, Efl.Canvas.Object_Animation 14 Efl.Gfx.Mapping, Efl.Canvas.Pointer, Efl.Canvas.Object_Animation
15{ 15{
16 [[Efl canvas object abstract class 16 [[Efl canvas object abstract class
17 17
@@ -483,10 +483,6 @@ abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity,
483 return: bool; [[$true if the coordinates are inside the object, $false otherwise]] 483 return: bool; [[$true if the coordinates are inside the object, $false otherwise]]
484 } 484 }
485 } 485 }
486 gesture_manager_get @beta {
487 [[Returns current canvas's gesture manager]]
488 return: const(Efl.Canvas.Gesture_Manager); [[The gesture manager]]
489 }
490 } 486 }
491 implements { 487 implements {
492 Efl.Object.constructor; 488 Efl.Object.constructor;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f01ab01e41..eff1188eb0 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -242,15 +242,6 @@ end:
242 return efl_finalize(efl_super(eo_obj, MY_CLASS)); 242 return efl_finalize(efl_super(eo_obj, MY_CLASS));
243} 243}
244 244
245EOLIAN const Efl_Canvas_Gesture_Manager *
246_efl_canvas_object_gesture_manager_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *pd)
247{
248 if (!pd->layer || !pd->layer->evas)
249 return NULL;
250
251 return (pd->layer->evas)->gesture_manager;
252}
253
254void 245void
255evas_object_change_reset(Evas_Object_Protected_Data *obj) 246evas_object_change_reset(Evas_Object_Protected_Data *obj)
256{ 247{