From 0ebe80fa0b11c8847f42318f436d75c69509eed6 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Sun, 30 Apr 2017 10:57:56 +0200 Subject: [PATCH] efl_ui_focus_manager: rename api from geometry to focus_geometry otherwise we would clash with efl.gfx. --- src/lib/elementary/efl_ui_focus_manager.c | 4 ++-- src/lib/elementary/efl_ui_focus_object.eo | 11 +++++++---- src/lib/elementary/elm_toolbar.c | 10 +++++++--- src/lib/elementary/elm_toolbar_item.eo | 2 +- src/lib/elementary/elm_widget.c | 10 ++++++---- src/lib/elementary/elm_widget.eo | 2 +- src/tests/elementary/elm_test_focus_common.c | 8 +++----- src/tests/elementary/elm_test_focus_sub.c | 9 ++++++--- src/tests/elementary/focus_test.eo | 2 +- src/tests/elementary/focus_test_sub_main.eo | 2 +- 10 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager.c b/src/lib/elementary/efl_ui_focus_manager.c index bd5df90195..77d7c96cf4 100644 --- a/src/lib/elementary/efl_ui_focus_manager.c +++ b/src/lib/elementary/efl_ui_focus_manager.c @@ -240,7 +240,7 @@ _calculate_node(Efl_Ui_Focus_Manager_Data *pd, Efl_Ui_Focus_Object *node, Dimens Node *n; nodes = eina_hash_iterator_data_new(pd->node_hash); - efl_ui_focus_object_geometry_get(node, &rect); + rect = efl_ui_focus_object_focus_geometry_get(node); *pos = NULL; *neg = NULL; @@ -266,7 +266,7 @@ _calculate_node(Efl_Ui_Focus_Manager_Data *pd, Efl_Ui_Focus_Object *node, Dimens if (n->type == NODE_TYPE_ONLY_LOGICAL) continue; - efl_ui_focus_object_geometry_get(op, &op_rect); + op_rect = efl_ui_focus_object_focus_geometry_get(op); if (dim == DIMENSION_X) { diff --git a/src/lib/elementary/efl_ui_focus_object.eo b/src/lib/elementary/efl_ui_focus_object.eo index 144da44724..78ba257ddb 100644 --- a/src/lib/elementary/efl_ui_focus_object.eo +++ b/src/lib/elementary/efl_ui_focus_object.eo @@ -7,10 +7,13 @@ mixin Efl.Ui.Focus.Object @since 1.20 ]] methods { - geometry_get { + @property focus_geometry { [[The geometry to use to calculate the relations to other objects.]] - params { - @out rect : Eina.Rectangle; [[The geometry to use.]] + get { + + } + values { + rect : Eina.Rectangle; [[The geometry to use.]] } } @property focus { @@ -29,7 +32,7 @@ mixin Efl.Ui.Focus.Object } } implements { - @empty .geometry_get; + @empty .focus_geometry; @empty .focus { get; } } events { diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 1b159246c2..eda47f4939 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2423,10 +2423,14 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it) _elm_access_activate_callback_set(ai, _access_activate_cb, NULL); } -EOLIAN static void -_elm_toolbar_item_efl_ui_focus_object_geometry_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Item_Data *pd, Eina_Rectangle *rect) +EOLIAN static Eina_Rectangle +_elm_toolbar_item_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Item_Data *pd) { - evas_object_geometry_get(VIEW(pd), &rect->x, &rect->y, &rect->w, &rect->h); + Eina_Rectangle rect; + + evas_object_geometry_get(VIEW(pd), &rect.x, &rect.y, &rect.w, &rect.h); + + return rect; } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo index a74cd6309e..c6d3ff159c 100644 --- a/src/lib/elementary/elm_toolbar_item.eo +++ b/src/lib/elementary/elm_toolbar_item.eo @@ -272,7 +272,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Item, Efl.Ui.Focus.Object) Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; - Efl.Ui.Focus.Object.geometry_get; + Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } Elm.Interface.Atspi_Accessible.name { get; } Elm.Interface.Atspi_Accessible.state_set { get; } diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index ac975be858..a8fb4ef6d5 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -6479,12 +6479,14 @@ _elm_widget_efl_ui_focus_user_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_ return pd->manager.manager; } -EOLIAN static void -_elm_widget_efl_ui_focus_object_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Eina_Rectangle *rect) +EOLIAN static Eina_Rectangle +_elm_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { - if (!rect) return; + Eina_Rectangle rect; - return efl_gfx_geometry_get(obj, &rect->x , &rect->y, &rect->w, &rect->h); + efl_gfx_geometry_get(obj, &rect.x , &rect.y, &rect.w, &rect.h); + + return rect; } EOLIAN static void diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index f41b15fe6d..7b8f70a27e 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -860,7 +860,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter Elm.Interface.Atspi_Component.focus_grab; Efl.Ui.Focus.User.manager { get; } Efl.Ui.Focus.User.parent { get; } - Efl.Ui.Focus.Object.geometry_get; + Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } } events { diff --git a/src/tests/elementary/elm_test_focus_common.c b/src/tests/elementary/elm_test_focus_common.c index 1e23553d99..5bf86382cd 100644 --- a/src/tests/elementary/elm_test_focus_common.c +++ b/src/tests/elementary/elm_test_focus_common.c @@ -79,12 +79,10 @@ _focus_test_efl_ui_focus_object_focus_set(Eo *obj, Focus_Test_Data *pd, Eina_Boo printf("Object %p now focused\n", obj); } -EOLIAN static void -_focus_test_efl_ui_focus_object_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd, Eina_Rectangle *rect) +EOLIAN static Eina_Rectangle +_focus_test_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd) { - if (!rect) return; - - *rect = pd->rect; + return pd->rect; } EOLIAN static void diff --git a/src/tests/elementary/elm_test_focus_sub.c b/src/tests/elementary/elm_test_focus_sub.c index bff1556ece..d214fb51b5 100644 --- a/src/tests/elementary/elm_test_focus_sub.c +++ b/src/tests/elementary/elm_test_focus_sub.c @@ -6,10 +6,13 @@ typedef struct { } Focus_Test_Sub_Main_Data; -EOLIAN static void -_focus_test_sub_main_efl_ui_focus_object_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Sub_Main_Data *pd EINA_UNUSED, Eina_Rectangle *rect) +EOLIAN static Eina_Rectangle +_focus_test_sub_main_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Sub_Main_Data *pd EINA_UNUSED) { - EINA_RECTANGLE_SET(rect, 0, 0, 20, 20); + Eina_Rectangle result; + EINA_RECTANGLE_SET(&result, 0, 0, 20, 20); + + return result; } EOLIAN static Efl_Ui_Focus_Manager* diff --git a/src/tests/elementary/focus_test.eo b/src/tests/elementary/focus_test.eo index fa3f3e25ae..27dd193c4a 100644 --- a/src/tests/elementary/focus_test.eo +++ b/src/tests/elementary/focus_test.eo @@ -8,7 +8,7 @@ class Focus.Test(Efl.Object, Efl.Ui.Focus.Object) { } implements { Efl.Object.constructor; - Efl.Ui.Focus.Object.geometry_get; + Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } } } diff --git a/src/tests/elementary/focus_test_sub_main.eo b/src/tests/elementary/focus_test_sub_main.eo index 39197aef5e..51a88d5ba1 100644 --- a/src/tests/elementary/focus_test_sub_main.eo +++ b/src/tests/elementary/focus_test_sub_main.eo @@ -2,6 +2,6 @@ class Focus.Test.Sub.Main(Efl.Object, Efl.Ui.Focus.User, Efl.Ui.Focus.Object, Ef implements { Efl.Ui.Focus.User.manager { get; } Efl.Ui.Focus.User.parent { get; } - Efl.Ui.Focus.Object.geometry_get; + Efl.Ui.Focus.Object.focus_geometry { get; } } }