From 4702f265afa4ffa79cfe23518df40384541df1e0 Mon Sep 17 00:00:00 2001 From: Guilherme Iscaro Date: Tue, 3 Jan 2017 17:17:04 -0200 Subject: Evas Canvas: Remove focused_objects property. This property is not needed and it will only increase the API size. One can simple achieve the same behaviour by simple doing: //C code... Eina_List *l; Evas_Device *dev; devices = evas_device_list(evas, NULL); EINA_LIST_FOREACH(devices, l, dev) { Evas_Object *obj; if (evas_device_class_get(dev) != EVAS_DEVICE_CLASS_SEAT) continue; obj = evas_canvas_seat_focus_get(dev); //Do something with the focused object..... } //More C code... --- src/lib/evas/canvas/evas_canvas.eo | 10 +--------- src/lib/evas/canvas/evas_focus.c | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index fa9cf006fb..d71b342dd8 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -138,7 +138,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, See also \@ref evas_object_focus_set, \@ref evas_object_focus_get, \@ref evas_object_key_grab, \@ref evas_object_key_ungrab, @.seat_focus.get, - @.focused_objects.get, @Efl.Canvas.Object.seat_focus_check, + @Efl.Canvas.Object.seat_focus_check, @Efl.Canvas.Object.seat_focus_add, @Efl.Canvas.Object.seat_focus_del. ]] @@ -158,14 +158,6 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, or $null if there is not one.]] } } - @property focused_objects { - [[Return an iterator of focused objects. @since 1.19]] - get { - return: free(own(iterator), eina_iterator_free); [[An iterator that contains - Eina_Hash_Tuple which the key is an - Efl.Input.Device and the data is an Efl.Canvas.Object or $null on error.]] - } - } @property seat_focus { [[Return the focused object by a given seat. @since 1.19]] get {} diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c index 36f265c1b0..71351cc90d 100644 --- a/src/lib/evas/canvas/evas_focus.c +++ b/src/lib/evas/canvas/evas_focus.c @@ -263,9 +263,3 @@ _evas_canvas_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Public_Data *e) { return _evas_canvas_seat_focus_get(eo_obj, e, NULL); } - -EOLIAN Eina_Iterator * -_evas_canvas_focused_objects_get(Eo *eo_obj EINA_UNUSED, Evas_Public_Data *e) -{ - return eina_hash_iterator_tuple_new(e->focused_objects); -} -- cgit v1.2.1