summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-21 14:09:41 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-22 10:09:48 +0100
commit71c390e6a225d64a54d78346bd8da7f617a61432 (patch)
tree11451ff427daca86a1f93490bec3a6329e772dba /src
parenta08570fdae9f178316e6bbbb291af4adaeb59d3a (diff)
api: efl.gfx.stack stack,changed -> stacking,changed
slight tweak to make this more consistent with meaning and docs ref T7560 Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de> Differential Revision: https://phab.enlightenment.org/D7988
Diffstat (limited to 'src')
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c6
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c2
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index c65636133d..c2e8c8f776 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -129,6 +129,6 @@ interface @beta Efl.Gfx.Stack
129 } 129 }
130 } 130 }
131 events { 131 events {
132 stack,changed: void; [[Object stacking was changed.]] 132 stacking,changed: void; [[Object stacking was changed.]]
133 } 133 }
134} 134}
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 41eac8223f..c72ea15531 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -5809,7 +5809,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb,
5809{ EFL_EVENT_DEL, _widget_shadow_del_cb }, 5809{ EFL_EVENT_DEL, _widget_shadow_del_cb },
5810{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _widget_shadow_event_cb }, 5810{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _widget_shadow_event_cb },
5811{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _widget_shadow_event_cb }, 5811{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _widget_shadow_event_cb },
5812{ EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _widget_shadow_event_cb }, 5812{ EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _widget_shadow_event_cb },
5813{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb }, 5813{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb },
5814{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb }) 5814{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb })
5815 5815
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c
index 8e3e3e1886..c0563b0b57 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -246,7 +246,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Obje
246 _child_insert(pd, sub); 246 _child_insert(pd, sub);
247 efl_event_callback_add(eo_sub, EFL_EVENT_INVALIDATE, _efl_canvas_object_event_grabber_child_invalidate, pd); 247 efl_event_callback_add(eo_sub, EFL_EVENT_INVALIDATE, _efl_canvas_object_event_grabber_child_invalidate, pd);
248 if (eo_sub != pd->rect) 248 if (eo_sub != pd->rect)
249 efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd); 249 efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd);
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
@@ -255,7 +255,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUS
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
257 efl_event_callback_del(member, EFL_EVENT_INVALIDATE, _efl_canvas_object_event_grabber_child_invalidate, pd); 257 efl_event_callback_del(member, EFL_EVENT_INVALIDATE, _efl_canvas_object_event_grabber_child_invalidate, pd);
258 efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd); 258 efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd);
259 pd->contained = eina_list_remove(pd->contained, obj); 259 pd->contained = eina_list_remove(pd->contained, obj);
260 260
261 EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events) 261 EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events)
@@ -350,7 +350,7 @@ _efl_canvas_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Gr
350 obj->is_event_parent = 1; 350 obj->is_event_parent = 1;
351 obj->is_smart = 0; 351 obj->is_smart = 0;
352 352
353 efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _efl_canvas_object_event_grabber_restack, pd); 353 efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _efl_canvas_object_event_grabber_restack, pd);
354 pd->rect = evas_object_rectangle_add(efl_parent_get(eo_obj)); 354 pd->rect = evas_object_rectangle_add(efl_parent_get(eo_obj));
355 evas_object_pointer_mode_set(pd->rect, EVAS_OBJECT_POINTER_MODE_NOGRAB); 355 evas_object_pointer_mode_set(pd->rect, EVAS_OBJECT_POINTER_MODE_NOGRAB);
356 efl_parent_set(pd->rect, eo_obj); 356 efl_parent_set(pd->rect, eo_obj);
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 3d7aadca4d..10c116a832 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -52,7 +52,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
52 EFL_GFX_ENTITY_EVENT_HIDE, 52 EFL_GFX_ENTITY_EVENT_HIDE,
53 EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, 53 EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
54 EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, 54 EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
55 EFL_GFX_ENTITY_EVENT_STACK_CHANGED, 55 EFL_GFX_ENTITY_EVENT_STACKING_CHANGED,
56 EVAS_OBJECT_EVENT_DEL, 56 EVAS_OBJECT_EVENT_DEL,
57 EFL_EVENT_HOLD, 57 EFL_EVENT_HOLD,
58 EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 58 EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index ce3e6f55de..0b8581e32d 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -64,7 +64,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj, Evas_Object_Protected_Data
64{ 64{
65 int event_id = _evas_object_event_new(); 65 int event_id = _evas_object_event_new();
66 66
67 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_STACK_CHANGED); 67 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED);
68 if (obj->layer) 68 if (obj->layer)
69 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 69 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
70} 70}