summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-04 12:46:41 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:28 -0700
commit80db4c0c220db9a04089729f159df5dab8835811 (patch)
treeed55a403b8a509ece3b322ebcfbc0dde557d5965 /src
parent5d81ae9dfb0a0731de38effb76d200fb94bd942c (diff)
Efl.Canvas.Event_Grabber (from Efl.Canvas.Object.Event.Grabber)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Evas.am4
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Legacy.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c (renamed from src/lib/evas/canvas/efl_canvas_object_event_grabber.c)42
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.eo (renamed from src/lib/evas/canvas/efl_canvas_object_event_grabber.eo)2
5 files changed, 26 insertions, 26 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 8134786ae5..497adf121e 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -3,7 +3,7 @@
3 3
4evas_canvas_eolian_pub_files = \ 4evas_canvas_eolian_pub_files = \
5 lib/evas/canvas/efl_canvas_object.eo \ 5 lib/evas/canvas/efl_canvas_object.eo \
6 lib/evas/canvas/efl_canvas_object_event_grabber.eo \ 6 lib/evas/canvas/efl_canvas_event_grabber.eo \
7 lib/evas/canvas/efl_canvas_polygon.eo \ 7 lib/evas/canvas/efl_canvas_polygon.eo \
8 lib/evas/canvas/efl_canvas_rectangle.eo \ 8 lib/evas/canvas/efl_canvas_rectangle.eo \
9 lib/evas/canvas/efl_canvas_text.eo \ 9 lib/evas/canvas/efl_canvas_text.eo \
@@ -253,7 +253,7 @@ lib/evas/canvas/evas_map.h \
253lib/evas/canvas/evas_gl.c \ 253lib/evas/canvas/evas_gl.c \
254lib/evas/canvas/evas_out.c \ 254lib/evas/canvas/evas_out.c \
255lib/evas/canvas/efl_canvas_image.c \ 255lib/evas/canvas/efl_canvas_image.c \
256lib/evas/canvas/efl_canvas_object_event_grabber.c \ 256lib/evas/canvas/efl_canvas_event_grabber.c \
257lib/evas/canvas/efl_canvas_proxy.c \ 257lib/evas/canvas/efl_canvas_proxy.c \
258lib/evas/canvas/efl_canvas_snapshot.c \ 258lib/evas/canvas/efl_canvas_snapshot.c \
259lib/evas/canvas/efl_canvas_scene3d.c \ 259lib/evas/canvas/efl_canvas_scene3d.c \
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index c6a6a935bb..cb4e069141 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -205,7 +205,7 @@ typedef struct Efl_Canvas_Object_Animation_Event_Info
205 205
206#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT) 206#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
207 207
208#include "canvas/efl_canvas_object_event_grabber.eo.h" 208#include "canvas/efl_canvas_event_grabber.eo.h"
209 209
210 /** 210 /**
211 * @defgroup Evas_3D Evas 3D Extensions 211 * @defgroup Evas_3D Evas 3D Extensions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index acd0dc74d5..ffff908978 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -8086,7 +8086,7 @@ EAPI void evas_object_text_filter_source_set(Evas_Object *obj, const char *name,
8086 * @since 1.20 8086 * @since 1.20
8087 */ 8087 */
8088EAPI Evas_Object *evas_object_event_grabber_add(Evas *e); 8088EAPI Evas_Object *evas_object_event_grabber_add(Evas *e);
8089#include "canvas/efl_canvas_object_event_grabber.eo.legacy.h" 8089#include "canvas/efl_canvas_event_grabber.eo.legacy.h"
8090 8090
8091#include "canvas/efl_canvas_animation_alpha.eo.legacy.h" 8091#include "canvas/efl_canvas_animation_alpha.eo.legacy.h"
8092#include "canvas/efl_canvas_animation.eo.legacy.h" 8092#include "canvas/efl_canvas_animation.eo.legacy.h"
diff --git a/src/lib/evas/canvas/efl_canvas_object_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c
index 295c450216..a054c993bf 100644
--- a/src/lib/evas/canvas/efl_canvas_object_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -1,8 +1,8 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include "efl_canvas_object_event_grabber.eo.h" 3#include "efl_canvas_event_grabber.eo.h"
4 4
5#define MY_CLASS EFL_CANVAS_OBJECT_EVENT_GRABBER_CLASS 5#define MY_CLASS EFL_CANVAS_EVENT_GRABBER_CLASS
6#define MY_CLASS_NAME "Efl_Object_Event_Grabber" 6#define MY_CLASS_NAME "Efl_Object_Event_Grabber"
7#define MY_CLASS_NAME_LEGACY "evas_object_event_grabber" 7#define MY_CLASS_NAME_LEGACY "evas_object_event_grabber"
8 8
@@ -46,7 +46,7 @@ _efl_canvas_group_group_iterator_free(Efl_Object_Event_Grabber_Iterator *it)
46} 46}
47 47
48EOLIAN static Eina_Iterator* 48EOLIAN static Eina_Iterator*
49_efl_canvas_object_event_grabber_efl_canvas_group_group_members_iterate(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd) 49_efl_canvas_event_grabber_efl_canvas_group_group_members_iterate(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
50{ 50{
51 Efl_Object_Event_Grabber_Iterator *it; 51 Efl_Object_Event_Grabber_Iterator *it;
52 52
@@ -67,7 +67,7 @@ _efl_canvas_object_event_grabber_efl_canvas_group_group_members_iterate(const Eo
67} 67}
68 68
69EOLIAN static Eina_Bool 69EOLIAN static Eina_Bool
70_efl_canvas_object_event_grabber_efl_canvas_group_group_member_is(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, const Eo *sub_obj) 70_efl_canvas_event_grabber_efl_canvas_group_group_member_is(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, const Eo *sub_obj)
71{ 71{
72 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 72 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
73 Evas_Object_Protected_Data *sub = efl_data_scope_safe_get(sub_obj, EFL_CANVAS_OBJECT_CLASS); 73 Evas_Object_Protected_Data *sub = efl_data_scope_safe_get(sub_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -197,7 +197,7 @@ _efl_canvas_object_event_grabber_child_del(void *data, const Efl_Event *event)
197} 197}
198 198
199EOLIAN static void 199EOLIAN static void
200_efl_canvas_object_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eo *eo_sub) 200_efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eo *eo_sub)
201{ 201{
202 Evas_Object_Protected_Data *sub = efl_data_scope_safe_get(eo_sub, EFL_CANVAS_OBJECT_CLASS); 202 Evas_Object_Protected_Data *sub = efl_data_scope_safe_get(eo_sub, EFL_CANVAS_OBJECT_CLASS);
203 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 203 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -250,7 +250,7 @@ _efl_canvas_object_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, E
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_efl_canvas_object_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member) 253_efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member)
254{ 254{
255 Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS); 255 Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS);
256 256
@@ -264,45 +264,45 @@ _efl_canvas_object_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EI
264} 264}
265 265
266EOLIAN static void 266EOLIAN static void
267_efl_canvas_object_event_grabber_efl_canvas_group_group_change(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED) 267_efl_canvas_event_grabber_efl_canvas_group_group_change(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
268{} 268{}
269 269
270EOLIAN static void 270EOLIAN static void
271_efl_canvas_object_event_grabber_efl_canvas_group_group_calculate(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED) 271_efl_canvas_event_grabber_efl_canvas_group_group_calculate(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
272{} 272{}
273 273
274EOLIAN static void 274EOLIAN static void
275_efl_canvas_object_event_grabber_efl_canvas_group_group_need_recalculate_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, Eina_Bool set EINA_UNUSED) 275_efl_canvas_event_grabber_efl_canvas_group_group_need_recalculate_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, Eina_Bool set EINA_UNUSED)
276{} 276{}
277 277
278EOLIAN static Eina_Bool 278EOLIAN static Eina_Bool
279_efl_canvas_object_event_grabber_efl_canvas_group_group_need_recalculate_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED) 279_efl_canvas_event_grabber_efl_canvas_group_group_need_recalculate_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
280{ 280{
281 return EINA_FALSE; 281 return EINA_FALSE;
282} 282}
283 283
284EOLIAN static void 284EOLIAN static void
285_efl_canvas_object_event_grabber_efl_gfx_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos) 285_efl_canvas_event_grabber_efl_gfx_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos)
286{ 286{
287 efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos); 287 efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos);
288 efl_gfx_position_set(pd->rect, pos); 288 efl_gfx_position_set(pd->rect, pos);
289} 289}
290 290
291EOLIAN static void 291EOLIAN static void
292_efl_canvas_object_event_grabber_efl_gfx_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz) 292_efl_canvas_event_grabber_efl_gfx_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz)
293{ 293{
294 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), sz); 294 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), sz);
295 efl_gfx_size_set(pd->rect, sz); 295 efl_gfx_size_set(pd->rect, sz);
296} 296}
297 297
298EOLIAN static Eina_Bool 298EOLIAN static Eina_Bool
299_efl_canvas_object_event_grabber_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd) 299_efl_canvas_event_grabber_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
300{ 300{
301 return pd->vis; 301 return pd->vis;
302} 302}
303 303
304EOLIAN static void 304EOLIAN static void
305_efl_canvas_object_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set) 305_efl_canvas_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
306{ 306{
307 if (set) 307 if (set)
308 { 308 {
@@ -319,7 +319,7 @@ _efl_canvas_object_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl
319} 319}
320 320
321EOLIAN static void 321EOLIAN static void
322_efl_canvas_object_event_grabber_efl_gfx_stack_layer_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, short l) 322_efl_canvas_event_grabber_efl_gfx_stack_layer_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, short l)
323{ 323{
324 efl_gfx_stack_layer_set(efl_super(eo_obj, MY_CLASS), l); 324 efl_gfx_stack_layer_set(efl_super(eo_obj, MY_CLASS), l);
325 efl_gfx_stack_layer_set(pd->rect, l); 325 efl_gfx_stack_layer_set(pd->rect, l);
@@ -339,7 +339,7 @@ _efl_canvas_object_event_grabber_restack(void *data, const Efl_Event *event)
339} 339}
340 340
341EOLIAN static Eo * 341EOLIAN static Eo *
342_efl_canvas_object_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd) 342_efl_canvas_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
343{ 343{
344 Evas_Object_Protected_Data *obj; 344 Evas_Object_Protected_Data *obj;
345 345
@@ -360,7 +360,7 @@ _efl_canvas_object_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_E
360} 360}
361 361
362EOLIAN static void 362EOLIAN static void
363_efl_canvas_object_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd) 363_efl_canvas_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
364{ 364{
365 Evas_Object_Protected_Data *obj; 365 Evas_Object_Protected_Data *obj;
366 Eina_List *l, *ln; 366 Eina_List *l, *ln;
@@ -372,7 +372,7 @@ _efl_canvas_object_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Ev
372} 372}
373 373
374static void 374static void
375_efl_canvas_object_event_grabber_class_constructor(Efl_Class *klass) 375_efl_canvas_event_grabber_class_constructor(Efl_Class *klass)
376{ 376{
377 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 377 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
378} 378}
@@ -385,7 +385,7 @@ evas_object_event_grabber_members_list(const Eo *eo_obj)
385} 385}
386 386
387EOLIAN static void 387EOLIAN static void
388_efl_canvas_object_event_grabber_freeze_when_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set) 388_efl_canvas_event_grabber_freeze_when_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
389{ 389{
390 set = !!set; 390 set = !!set;
391 if (pd->freeze == set) return; 391 if (pd->freeze == set) return;
@@ -395,7 +395,7 @@ _efl_canvas_object_event_grabber_freeze_when_visible_set(Eo *eo_obj EINA_UNUSED,
395} 395}
396 396
397EOLIAN static Eina_Bool 397EOLIAN static Eina_Bool
398_efl_canvas_object_event_grabber_freeze_when_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd) 398_efl_canvas_event_grabber_freeze_when_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
399{ 399{
400 return pd->freeze; 400 return pd->freeze;
401} 401}
@@ -407,4 +407,4 @@ evas_object_event_grabber_add(Evas *eo_e)
407 return efl_add(MY_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added)); 407 return efl_add(MY_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added));
408} 408}
409 409
410#include "efl_canvas_object_event_grabber.eo.c" 410#include "efl_canvas_event_grabber.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_object_event_grabber.eo b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
index 06f586131e..53019d385e 100644
--- a/src/lib/evas/canvas/efl_canvas_object_event_grabber.eo
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.Object.Event.Grabber (Efl.Canvas.Group) 1class Efl.Canvas.Event_Grabber (Efl.Canvas.Group)
2{ 2{
3 [[Low-level rectangle object. 3 [[Low-level rectangle object.
4 4