summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 19:51:49 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 20:53:20 +0900
commitf1ab8c8fee7f422b8a4041c27b0a38fec2375bb8 (patch)
treef677122ecf4eaeef8a4524ffd854b27265c400fc
parent1d62f9dc7c67b9cc9fb6ce128576b87f6e81d9d4 (diff)
widget: Remove more functions from EO
Internaaaaaaaalsssss.... Ref T5363
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elm_widget.c20
-rw-r--r--src/lib/elementary/elm_widget.eo20
3 files changed, 15 insertions, 27 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 87cbbbe014..52993e2a9f 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6602,7 +6602,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS
6602 * focused object **/ 6602 * focused object **/
6603 unsigned int order = 0; 6603 unsigned int order = 0;
6604 Evas_Object *target; 6604 Evas_Object *target;
6605 target = elm_obj_widget_newest_focus_order_get(win, &order, EINA_TRUE); 6605 target = elm_widget_newest_focus_order_get(win, &order, EINA_TRUE);
6606 if (target) 6606 if (target)
6607 elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 6607 elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
6608 } 6608 }
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 962bff97be..8d5c26c087 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1821,13 +1821,15 @@ elm_widget_tree_unfocusable_get(const Eo *obj)
1821 * 1821 *
1822 * @ingroup Widget 1822 * @ingroup Widget
1823 */ 1823 */
1824EOLIAN static Eina_List* 1824EAPI Eina_List*
1825_elm_widget_can_focus_child_list_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 1825elm_widget_can_focus_child_list_get(const Eo *obj)
1826{ 1826{
1827 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
1827 const Eina_List *l; 1828 const Eina_List *l;
1828 Eina_List *child_list = NULL; 1829 Eina_List *child_list = NULL;
1829 Evas_Object *child; 1830 Evas_Object *child;
1830 1831
1832 if (!sd) return NULL;
1831 EINA_LIST_FOREACH(sd->subobjs, l, child) 1833 EINA_LIST_FOREACH(sd->subobjs, l, child)
1832 { 1834 {
1833 if (!_elm_widget_is(child)) continue; 1835 if (!_elm_widget_is(child)) continue;
@@ -1918,9 +1920,13 @@ _elm_widget_focus_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
1918 return (sd->focused && sd->top_win_focused); 1920 return (sd->focused && sd->top_win_focused);
1919} 1921}
1920 1922
1921EOLIAN static Eina_Bool 1923/** @internal */
1922_elm_widget_highlight_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 1924EAPI Eina_Bool
1925elm_widget_highlight_get(const Eo *obj)
1923{ 1926{
1927 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
1928 if (!sd) return EINA_FALSE;
1929
1924 return sd->highlighted; 1930 return sd->highlighted;
1925} 1931}
1926 1932
@@ -4387,12 +4393,14 @@ _elm_widget_focus_order_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
4387 return sd->focus_order; 4393 return sd->focus_order;
4388} 4394}
4389 4395
4390EOLIAN static Evas_Object* 4396EAPI Evas_Object*
4391_elm_widget_newest_focus_order_get(const Eo *obj, Elm_Widget_Smart_Data *sd, unsigned int *newest_focus_order, Eina_Bool can_focus_only) 4397elm_widget_newest_focus_order_get(const Eo *obj, unsigned int *newest_focus_order, Eina_Bool can_focus_only)
4392{ 4398{
4399 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
4393 const Eina_List *l; 4400 const Eina_List *l;
4394 Evas_Object *child, *cur, *best; 4401 Evas_Object *child, *cur, *best;
4395 4402
4403 if (!sd) return NULL;
4396 if (!evas_object_visible_get(obj) 4404 if (!evas_object_visible_get(obj)
4397 || (elm_widget_disabled_get(obj)) 4405 || (elm_widget_disabled_get(obj))
4398 || (elm_widget_tree_unfocusable_get(obj))) 4406 || (elm_widget_tree_unfocusable_get(obj)))
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 5154ec44f8..31384ea714 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -380,24 +380,12 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
380 return: int; [[FIXME]] 380 return: int; [[FIXME]]
381 } 381 }
382 } 382 }
383 @property can_focus_child_list {
384 [[Can focus children list]]
385 get {
386 return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; [[List of children which can focus]]
387 }
388 }
389 @property focused_item { 383 @property focused_item {
390 get { 384 get {
391 [[Get the focused widget item.]] 385 [[Get the focused widget item.]]
392 return: Elm.Widget.Item; [[Focused item]] 386 return: Elm.Widget.Item; [[Focused item]]
393 } 387 }
394 } 388 }
395 @property highlight {
396 [[Highlight property]]
397 get {
398 return: bool; [[$true if widget is highlight, $false otherwise]]
399 }
400 }
401 @property focused_object { 389 @property focused_object {
402 [[Current focused object in object tree.]] 390 [[Current focused object in object tree.]]
403 get { 391 get {
@@ -413,14 +401,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
413 label: string; [[Label]] 401 label: string; [[Label]]
414 } 402 }
415 } 403 }
416 newest_focus_order_get @const {
417 [[Get newest focus in order]]
418 return: Efl.Canvas.Object; [[Handle to focused widget]]
419 params {
420 @out newest_focus_order: uint; [[Newest focus order]]
421 @in can_focus_only: bool; [[$true only us widgets which can focus, $false otherweise]]
422 }
423 }
424 scroll_hold_push { 404 scroll_hold_push {
425 [[Push scroll hold]] 405 [[Push scroll hold]]
426 } 406 }