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

diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index f6c2e97..9c54b01 100644 (file)
--- 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
 
    rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,
                   efl_gfx_color_set(efl_added, 0, 0, 0, 0),
-                  efl_gfx_stack_raise(efl_added),
+                  efl_gfx_stack_raise_to_top(efl_added),
                   efl_canvas_object_repeat_events_set(efl_added, EINA_TRUE),
                   efl_event_callback_add(efl_added, EFL_EVENT_POINTER_WHEEL, _zoomable_mouse_wheel_cb, zoomable)
                  );

diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index c122b48..515fa73 100644 (file)
--- 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
             @in below: Efl.Gfx.Stack @nonull; [[The object below which to stack]]
          }
       }
-      raise {
+      raise_to_top {
          [[Raise $obj to the top of its layer.
 
            $obj will, then, be the highest one in the layer it belongs
            to. Object on other layers won't get touched.
 
-           See also @.stack_above(), @.stack_below() and @.lower()]]
+           See also @.stack_above(), @.stack_below() and @.lower_to_bottom()]]
 
       }
       stack_above {
@@ -118,13 +118,13 @@ interface Efl.Gfx.Stack
             @in above: Efl.Gfx.Stack @nonull; [[The object above which to stack]]
          }
       }
-      lower {
+      lower_to_bottom {
          [[Lower $obj to the bottom of its layer.
 
            $obj will, then, be the lowest one in the layer it belongs
            to. Objects on other layers won't get touched.
 
-           See also @.stack_above(), @.stack_below() and @.raise() ]]
+           See also @.stack_above(), @.stack_below() and @.raise_to_top() ]]
 
       }
    }

diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 99e5b69..0be40fb 100644 (file)
--- 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)
    edje_object_freeze(wd->resize_obj);
    o = (Evas_Object *)edje_object_part_object_get(wd->resize_obj, "efl.dragable.vbar");
    edje_object_thaw(wd->resize_obj);
-   efl_gfx_stack_raise((Eo *)o);
+   efl_gfx_stack_raise_to_top((Eo *)o);
 
    efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE);
 

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 66bbd4f..a649113 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6991,7 +6991,7 @@ _efl_ui_win_activate(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_win_efl_gfx_stack_raise(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
+_efl_ui_win_efl_gfx_stack_raise_to_top(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
 {
    TRAP(pd, raise);
 }
@@ -6999,11 +6999,11 @@ _efl_ui_win_efl_gfx_stack_raise(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
 EAPI void
 elm_win_raise(Eo *obj)
 {
-   efl_gfx_stack_raise(obj);
+   efl_gfx_stack_raise_to_top(obj);
 }
 
 EOLIAN static void
-_efl_ui_win_efl_gfx_stack_lower(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED)
+_efl_ui_win_efl_gfx_stack_lower_to_bottom(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED)
 {
    // Do nothing: in X we could request to stack lower but that has been abused
    // 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 ced7416..f0a956e 100644 (file)
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -865,9 +865,9 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W
       Efl.Gfx.Entity.visible { set; }
       Efl.Gfx.Entity.position { set; }
       Efl.Gfx.Entity.size { set; }
-      Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so
-                             that it's not covered by any other window.]]
-      Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]]
+      Efl.Gfx.Stack.raise_to_top; [[Places the window at the top of the stack, so
+                                   that it's not covered by any other window.]]
+      Efl.Gfx.Stack.lower_to_bottom; [[This action is ignored by the Window.]]
       Efl.Ui.Widget.theme_apply;
       Efl.Ui.Focus.Object.focus { get; }
       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 6bcae5d..131be27 100644 (file)
--- 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,
       Efl.Gfx.Stack.above { get; }
       Efl.Gfx.Stack.stack_below;
       Efl.Gfx.Stack.stack_above;
-      Efl.Gfx.Stack.raise;
-      Efl.Gfx.Stack.lower;
+      Efl.Gfx.Stack.raise_to_top;
+      Efl.Gfx.Stack.lower_to_bottom;
       Efl.Gfx.Size_Hint.hint_aspect { get; set; }
       Efl.Gfx.Size_Hint.hint_align { get; set; }
       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 fba95e7..2d83a4a 100644 (file)
--- 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,
 }
 
 static void
-_efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
+_efl_canvas_vg_node_efl_gfx_stack_raise_to_top(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
 {
    Efl_Canvas_Vg_Container_Data *cd;
    Eina_List *lookup, *next;
@@ -472,7 +472,7 @@ _efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
 }
 
 static void
-_efl_canvas_vg_node_efl_gfx_stack_lower(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
+_efl_canvas_vg_node_efl_gfx_stack_lower_to_bottom(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
 {
    Efl_Canvas_Vg_Container_Data *cd;
    Eina_List *lookup, *prev;
@@ -833,13 +833,13 @@ evas_vg_node_stack_above(Eo *obj, Eo *above)
 EAPI void
 evas_vg_node_raise(Eo *obj)
 {
-   efl_gfx_stack_raise(obj);
+   efl_gfx_stack_raise_to_top(obj);
 }
 
 EAPI void
 evas_vg_node_lower(Eo *obj)
 {
-   efl_gfx_stack_lower(obj);
+   efl_gfx_stack_lower_to_bottom(obj);
 }
 
 #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 b20ec58..55ce3ef 100644 (file)
--- 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
       Efl.Gfx.Stack.above { get; }
       Efl.Gfx.Stack.stack_below;
       Efl.Gfx.Stack.stack_above;
-      Efl.Gfx.Stack.raise;
-      Efl.Gfx.Stack.lower;
+      Efl.Gfx.Stack.raise_to_top;
+      Efl.Gfx.Stack.lower_to_bottom;
       Efl.Gfx.Path.interpolate;
       Efl.Duplicate.duplicate;
    }

diff --git a/src/lib/evas/canvas/evas_stack.x b/src/lib/evas/canvas/evas_stack.x
index 4b73c22..914d047 100644 (file)
--- 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)
 EAPI void
 evas_object_raise(Evas_Object *obj)
 {
-   efl_gfx_stack_raise((Evas_Object *)obj);
+   efl_gfx_stack_raise_to_top((Evas_Object *)obj);
 }
 
 EOLIAN void
-_efl_canvas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_gfx_stack_raise_to_top(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
    if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_RAISE, 1))
      return;
@@ -86,11 +86,11 @@ _efl_canvas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *o
 EAPI void
 evas_object_lower(Evas_Object *obj)
 {
-   efl_gfx_stack_lower((Evas_Object *)obj);
+   efl_gfx_stack_lower_to_bottom((Evas_Object *)obj);
 }
 
 EOLIAN void
-_efl_canvas_object_efl_gfx_stack_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_gfx_stack_lower_to_bottom(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
    if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_LOWER, 1))
      return;

diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index b3f850c..65508a0 100644 (file)
--- 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
    evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
    fd->x = x;
    fd->y = y;
-   efl_gfx_stack_raise(o);
+   efl_gfx_stack_raise_to_top(o);
 }
 
 static void
@@ -531,7 +531,7 @@ video_obj_signal_frame_resize_start_cb(void *data EINA_UNUSED, Evas_Object *o, c
    evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
    fd->x = x;
    fd->y = y;
-   efl_gfx_stack_raise(o);
+   efl_gfx_stack_raise_to_top(o);
 }
 
 static void