From: hermet Date: Tue, 6 Mar 2012 01:06:41 +0000 (+0000) Subject: elementary/focus - X-Git-Tag: REL_F_I9500_20120323_1~17^2~376 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7818cd5b533f3aa5f3498008ba274d430cd117e;p=framework%2Fuifw%2Felementary.git elementary/focus - elm_object_focus_cycle -> elm_object_focus_next git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68754 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h index 1a12de6..1f4c88c 100644 --- a/src/lib/elm_deprecated.h +++ b/src/lib/elm_deprecated.h @@ -1419,6 +1419,21 @@ EINA_DEPRECATED EAPI double elm_flipselector_interval_get(c EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj); /** + * Give focus to next object in object tree. + * + * Give focus to next object in focus chain of one object sub-tree. + * If the last object of chain already have focus, the focus will go to the + * first object of chain. + * + * @param obj The object root of sub-tree + * @param dir Direction to cycle the focus + * + * @deprecated Use elm_object_focus_next() instead + * @ingroup Focus + */ +EINA_DEPRECATED EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir); + +/** * Remove the focus from an Elementary object * * @param obj The Elementary to take focus from diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h index 8457773..c71bbd3 100644 --- a/src/lib/elm_focus.h +++ b/src/lib/elm_focus.h @@ -225,12 +225,11 @@ EAPI void elm_object_focus_custom_chain_prepend(Evas_Object *obj * first object of chain. * * @param obj The object root of sub-tree - * @param dir Direction to cycle the focus + * @param dir Direction to move the focus * * @ingroup Focus */ -//XXX: How about elm_object_focus_move()? focus_next() ? -EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir); +EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Direction dir); /** * Make the elementary object and its children to be unfocusable diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 9ecbd8e..59dbff8 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1558,10 +1558,17 @@ elm_object_focus_custom_chain_prepend(Evas_Object *obj, elm_widget_focus_custom_chain_prepend(obj, child, relative_child); } -EAPI void +EINA_DEPRECATED EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir) { + elm_object_focus_next(obj, dir); +} + +EAPI void +elm_object_focus_next(Evas_Object *obj, + Elm_Focus_Direction dir) +{ EINA_SAFETY_ON_NULL_RETURN(obj); elm_widget_focus_cycle(obj, dir); }