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

@@ -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)
           {

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 {
+            get {
-                @out rect : Eina.Rectangle; [[The geometry to use.]]
+
+            }
+            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 {

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
+EOLIAN static Eina_Rectangle
-_elm_toolbar_item_efl_ui_focus_object_geometry_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Item_Data *pd, Eina_Rectangle *rect)
+_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 *

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; }

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
+EOLIAN static Eina_Rectangle
-_elm_widget_efl_ui_focus_object_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Eina_Rectangle *rect)
+_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

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 {

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
+EOLIAN static Eina_Rectangle
-_focus_test_efl_ui_focus_object_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd, Eina_Rectangle *rect)
+_focus_test_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
 {
-   if (!rect) return;
+   return pd->rect;
-
-   *rect = pd->rect;
 }
 
 EOLIAN static void

src/tests/elementary/elm_test_focus_sub.c

@@ -6,10 +6,13 @@ typedef struct {
 } Focus_Test_Sub_Main_Data;
 
 
-EOLIAN static void
+EOLIAN static Eina_Rectangle
-_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)
+_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*

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; }
     }
 }

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; }
     }
 }