summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-02-14 08:57:22 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-14 08:57:22 -0500
commitc2adefd7f29e98fd782cf5f90fe2b395c4d82c9e (patch)
tree1f9cdfb5085eb03fed2b66d77b628f75ad147c39
parentc270aabdc0122e8a572b04566f5a6645cba22c9f (diff)
Efl.Gfx.Stack: Rename raise and lower
Summary: to move_to_top and move_to_bottom since the previous names seemed to indicate that the object only moved one step instead of all the way through the top or the bottom of the stack. Ref T7560 Test Plan: make && make check && make examples work as before Reviewers: cedric, zmike Reviewed By: zmike Subscribers: kimcinoo, #reviewers, #committers Tags: #efl Maniphest Tasks: T7560 Differential Revision: https://phab.enlightenment.org/D7934
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo8
-rw-r--r--src/lib/elementary/efl_ui_list_view.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c6
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.eo4
-rw-r--r--src/lib/evas/canvas/evas_stack.x8
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c4
10 files changed, 26 insertions, 26 deletions
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index f6c2e9711b..9c54b01207 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -836,7 +836,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
836 836
837 rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, 837 rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,
838 efl_gfx_color_set(efl_added, 0, 0, 0, 0), 838 efl_gfx_color_set(efl_added, 0, 0, 0, 0),
839 efl_gfx_stack_raise(efl_added), 839 efl_gfx_stack_raise_to_top(efl_added),
840 efl_canvas_object_repeat_events_set(efl_added, EINA_TRUE), 840 efl_canvas_object_repeat_events_set(efl_added, EINA_TRUE),
841 efl_event_callback_add(efl_added, EFL_EVENT_POINTER_WHEEL, _zoomable_mouse_wheel_cb, zoomable) 841 efl_event_callback_add(efl_added, EFL_EVENT_POINTER_WHEEL, _zoomable_mouse_wheel_cb, zoomable)
842 ); 842 );
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index c122b48260..515fa73a30 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -84,13 +84,13 @@ interface Efl.Gfx.Stack
84 @in below: Efl.Gfx.Stack @nonull; [[The object below which to stack]] 84 @in below: Efl.Gfx.Stack @nonull; [[The object below which to stack]]
85 } 85 }
86 } 86 }
87 raise { 87 raise_to_top {
88 [[Raise $obj to the top of its layer. 88 [[Raise $obj to the top of its layer.
89 89
90 $obj will, then, be the highest one in the layer it belongs 90 $obj will, then, be the highest one in the layer it belongs
91 to. Object on other layers won't get touched. 91 to. Object on other layers won't get touched.
92 92
93 See also @.stack_above(), @.stack_below() and @.lower()]] 93 See also @.stack_above(), @.stack_below() and @.lower_to_bottom()]]
94 94
95 } 95 }
96 stack_above { 96 stack_above {
@@ -118,13 +118,13 @@ interface Efl.Gfx.Stack
118 @in above: Efl.Gfx.Stack @nonull; [[The object above which to stack]] 118 @in above: Efl.Gfx.Stack @nonull; [[The object above which to stack]]
119 } 119 }
120 } 120 }
121 lower { 121 lower_to_bottom {
122 [[Lower $obj to the bottom of its layer. 122 [[Lower $obj to the bottom of its layer.
123 123
124 $obj will, then, be the lowest one in the layer it belongs 124 $obj will, then, be the lowest one in the layer it belongs
125 to. Objects on other layers won't get touched. 125 to. Objects on other layers won't get touched.
126 126
127 See also @.stack_above(), @.stack_below() and @.raise() ]] 127 See also @.stack_above(), @.stack_below() and @.raise_to_top() ]]
128 128
129 } 129 }
130 } 130 }
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index fe454690a0..7370fce15f 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -609,7 +609,7 @@ _efl_ui_list_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_View_Data *pd)
609 edje_object_freeze(wd->resize_obj); 609 edje_object_freeze(wd->resize_obj);
610 o = (Evas_Object *)edje_object_part_object_get(wd->resize_obj, "efl.dragable.vbar"); 610 o = (Evas_Object *)edje_object_part_object_get(wd->resize_obj, "efl.dragable.vbar");
611 edje_object_thaw(wd->resize_obj); 611 edje_object_thaw(wd->resize_obj);
612 efl_gfx_stack_raise((Eo *)o); 612 efl_gfx_stack_raise_to_top((Eo *)o);
613 613
614 efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE); 614 efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE);
615 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); 615 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 442194e1cb..4a6ec30605 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5972,7 +5972,7 @@ _efl_ui_win_activate(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
5972} 5972}
5973 5973
5974EOLIAN static void 5974EOLIAN static void
5975_efl_ui_win_efl_gfx_stack_raise(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd) 5975_efl_ui_win_efl_gfx_stack_raise_to_top(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
5976{ 5976{
5977 TRAP(pd, raise); 5977 TRAP(pd, raise);
5978} 5978}
@@ -5980,11 +5980,11 @@ _efl_ui_win_efl_gfx_stack_raise(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
5980EAPI void 5980EAPI void
5981elm_win_raise(Eo *obj) 5981elm_win_raise(Eo *obj)
5982{ 5982{
5983 efl_gfx_stack_raise(obj); 5983 efl_gfx_stack_raise_to_top(obj);
5984} 5984}
5985 5985
5986EOLIAN static void 5986EOLIAN static void
5987_efl_ui_win_efl_gfx_stack_lower(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED) 5987_efl_ui_win_efl_gfx_stack_lower_to_bottom(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED)
5988{ 5988{
5989 // Do nothing: in X we could request to stack lower but that has been abused 5989 // Do nothing: in X we could request to stack lower but that has been abused
5990 // and transformed into a kind of "iconify". As a consequence, lower is 5990 // and transformed into a kind of "iconify". As a consequence, lower is
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index fc2d52fd52..98907b4c55 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -832,9 +832,9 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W
832 Efl.Gfx.Entity.visible { set; } 832 Efl.Gfx.Entity.visible { set; }
833 Efl.Gfx.Entity.position { set; } 833 Efl.Gfx.Entity.position { set; }
834 Efl.Gfx.Entity.size { set; } 834 Efl.Gfx.Entity.size { set; }
835 Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so 835 Efl.Gfx.Stack.raise_to_top; [[Places the window at the top of the stack, so
836 that it's not covered by any other window.]] 836 that it's not covered by any other window.]]
837 Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]] 837 Efl.Gfx.Stack.lower_to_bottom; [[This action is ignored by the Window.]]
838 Efl.Ui.Widget.theme_apply; 838 Efl.Ui.Widget.theme_apply;
839 Efl.Ui.Focus.Object.focus { get; } 839 Efl.Ui.Focus.Object.focus { get; }
840 Efl.Ui.Widget.focus_highlight_style { get; set; } 840 Efl.Ui.Widget.focus_highlight_style { get; set; }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 6bcae5d1ee..131be273f7 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -598,8 +598,8 @@ abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity,
598 Efl.Gfx.Stack.above { get; } 598 Efl.Gfx.Stack.above { get; }
599 Efl.Gfx.Stack.stack_below; 599 Efl.Gfx.Stack.stack_below;
600 Efl.Gfx.Stack.stack_above; 600 Efl.Gfx.Stack.stack_above;
601 Efl.Gfx.Stack.raise; 601 Efl.Gfx.Stack.raise_to_top;
602 Efl.Gfx.Stack.lower; 602 Efl.Gfx.Stack.lower_to_bottom;
603 Efl.Gfx.Size_Hint.hint_aspect { get; set; } 603 Efl.Gfx.Size_Hint.hint_aspect { get; set; }
604 Efl.Gfx.Size_Hint.hint_align { get; set; } 604 Efl.Gfx.Size_Hint.hint_align { get; set; }
605 Efl.Gfx.Size_Hint.hint_combined_min { get; } 605 Efl.Gfx.Size_Hint.hint_combined_min { get; }
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.c b/src/lib/evas/canvas/efl_canvas_vg_node.c
index fba95e7924..2d83a4a79f 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.c
@@ -384,7 +384,7 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
384} 384}
385 385
386static void 386static void
387_efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED) 387_efl_canvas_vg_node_efl_gfx_stack_raise_to_top(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
388{ 388{
389 Efl_Canvas_Vg_Container_Data *cd; 389 Efl_Canvas_Vg_Container_Data *cd;
390 Eina_List *lookup, *next; 390 Eina_List *lookup, *next;
@@ -472,7 +472,7 @@ _efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
472} 472}
473 473
474static void 474static void
475_efl_canvas_vg_node_efl_gfx_stack_lower(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED) 475_efl_canvas_vg_node_efl_gfx_stack_lower_to_bottom(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
476{ 476{
477 Efl_Canvas_Vg_Container_Data *cd; 477 Efl_Canvas_Vg_Container_Data *cd;
478 Eina_List *lookup, *prev; 478 Eina_List *lookup, *prev;
@@ -833,13 +833,13 @@ evas_vg_node_stack_above(Eo *obj, Eo *above)
833EAPI void 833EAPI void
834evas_vg_node_raise(Eo *obj) 834evas_vg_node_raise(Eo *obj)
835{ 835{
836 efl_gfx_stack_raise(obj); 836 efl_gfx_stack_raise_to_top(obj);
837} 837}
838 838
839EAPI void 839EAPI void
840evas_vg_node_lower(Eo *obj) 840evas_vg_node_lower(Eo *obj)
841{ 841{
842 efl_gfx_stack_lower(obj); 842 efl_gfx_stack_lower_to_bottom(obj);
843} 843}
844 844
845#include "efl_canvas_vg_node.eo.c" 845#include "efl_canvas_vg_node.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.eo b/src/lib/evas/canvas/efl_canvas_vg_node.eo
index b20ec58f9d..55ce3ef6fb 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.eo
@@ -66,8 +66,8 @@ abstract Efl.Canvas.Vg.Node extends Efl.Object implements Efl.Gfx.Entity, Efl.Gf
66 Efl.Gfx.Stack.above { get; } 66 Efl.Gfx.Stack.above { get; }
67 Efl.Gfx.Stack.stack_below; 67 Efl.Gfx.Stack.stack_below;
68 Efl.Gfx.Stack.stack_above; 68 Efl.Gfx.Stack.stack_above;
69 Efl.Gfx.Stack.raise; 69 Efl.Gfx.Stack.raise_to_top;
70 Efl.Gfx.Stack.lower; 70 Efl.Gfx.Stack.lower_to_bottom;
71 Efl.Gfx.Path.interpolate; 71 Efl.Gfx.Path.interpolate;
72 Efl.Duplicate.duplicate; 72 Efl.Duplicate.duplicate;
73 } 73 }
diff --git a/src/lib/evas/canvas/evas_stack.x b/src/lib/evas/canvas/evas_stack.x
index 4b73c22999..914d04731e 100644
--- a/src/lib/evas/canvas/evas_stack.x
+++ b/src/lib/evas/canvas/evas_stack.x
@@ -37,11 +37,11 @@ evas_object_below_get_internal(const Evas_Object_Protected_Data *obj)
37EAPI void 37EAPI void
38evas_object_raise(Evas_Object *obj) 38evas_object_raise(Evas_Object *obj)
39{ 39{
40 efl_gfx_stack_raise((Evas_Object *)obj); 40 efl_gfx_stack_raise_to_top((Evas_Object *)obj);
41} 41}
42 42
43EOLIAN void 43EOLIAN void
44_efl_canvas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj) 44_efl_canvas_object_efl_gfx_stack_raise_to_top(Eo *eo_obj, Evas_Object_Protected_Data *obj)
45{ 45{
46 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_RAISE, 1)) 46 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_RAISE, 1))
47 return; 47 return;
@@ -86,11 +86,11 @@ _efl_canvas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *o
86EAPI void 86EAPI void
87evas_object_lower(Evas_Object *obj) 87evas_object_lower(Evas_Object *obj)
88{ 88{
89 efl_gfx_stack_lower((Evas_Object *)obj); 89 efl_gfx_stack_lower_to_bottom((Evas_Object *)obj);
90} 90}
91 91
92EOLIAN void 92EOLIAN void
93_efl_canvas_object_efl_gfx_stack_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj) 93_efl_canvas_object_efl_gfx_stack_lower_to_bottom(Eo *eo_obj, Evas_Object_Protected_Data *obj)
94{ 94{
95 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_LOWER, 1)) 95 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_LOWER, 1))
96 return; 96 return;
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index b3f850c812..65508a0cc5 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -506,7 +506,7 @@ video_obj_signal_frame_move_start_cb(void *data EINA_UNUSED, Evas_Object *o, con
506 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 506 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
507 fd->x = x; 507 fd->x = x;
508 fd->y = y; 508 fd->y = y;
509 efl_gfx_stack_raise(o); 509 efl_gfx_stack_raise_to_top(o);
510} 510}
511 511
512static void 512static void
@@ -531,7 +531,7 @@ video_obj_signal_frame_resize_start_cb(void *data EINA_UNUSED, Evas_Object *o, c
531 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 531 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
532 fd->x = x; 532 fd->x = x;
533 fd->y = y; 533 fd->y = y;
534 efl_gfx_stack_raise(o); 534 efl_gfx_stack_raise_to_top(o);
535} 535}
536 536
537static void 537static void