summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-11-29 17:39:42 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-11-29 19:25:14 +0900
commit29b47e0a0776e9cc74ad8b9fc00fa3271c4d5486 (patch)
tree2f32ef07ddb49a6bf0db2f58225c3cd0fcb2fd4f
parent8faa65d90b5e148b30ffa7c589f7ff7bc14026f7 (diff)
focus: remove focus.get{} from widget.eo
This is taking care by focus manager now.
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_clock.c2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c12
-rw-r--r--src/lib/elementary/efl_ui_slider.c14
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/efl_ui_win.c8
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elm_access.c2
-rw-r--r--src/lib/elementary/elm_calendar.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c8
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_list.c8
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_map.c2
-rw-r--r--src/lib/elementary/elm_plug.c2
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_toolbar.c2
-rw-r--r--src/lib/elementary/elm_widget.c14
-rw-r--r--src/lib/elementary/elm_widget.eo16
-rw-r--r--src/lib/elementary/elm_widget.h3
27 files changed, 53 insertions, 76 deletions
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index df5e9d6a38..8b8a82da9a 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -876,7 +876,7 @@ _efl_ui_calendar_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd, E
876 // After arranging focus logic in this widget, we need to make 876 // After arranging focus logic in this widget, we need to make
877 // focused item which is for indicating direction key input movement 877 // focused item which is for indicating direction key input movement
878 // on the calendar widget. 878 // on the calendar widget.
879 if (elm_widget_focus_get(obj)) 879 if (efl_ui_focus_object_focus_get(obj))
880 _update_focused_it(obj, sd->selected_it); 880 _update_focused_it(obj, sd->selected_it);
881 else 881 else
882 _update_unfocused_it(obj, sd->focused_it); 882 _update_unfocused_it(obj, sd->focused_it);
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index bd11bc8d60..969cfd9e41 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -454,7 +454,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Obj
454 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 454 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
455 if (!int_ret) return EINA_FALSE; 455 if (!int_ret) return EINA_FALSE;
456 456
457 if (!elm_widget_focus_get(obj)) 457 if (!efl_ui_focus_object_focus_get(obj))
458 { 458 {
459 if ((dt_mod) && (dt_mod->obj_hide)) 459 if ((dt_mod) && (dt_mod->obj_hide))
460 dt_mod->obj_hide(sd->mod_data); 460 dt_mod->obj_hide(sd->mod_data);
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 5ad22f723a..388235f416 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -869,7 +869,7 @@ _efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable
869 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 869 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
870 if (!int_ret) return EINA_FALSE; 870 if (!int_ret) return EINA_FALSE;
871 871
872 if (elm_widget_focus_get(obj)) 872 if (efl_ui_focus_object_focus_get(obj))
873 { 873 {
874 edje_object_signal_emit 874 edje_object_signal_emit
875 (wd->resize_obj, "elm,action,focus", "elm"); 875 (wd->resize_obj, "elm,action,focus", "elm");
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 15534c7b7d..65343c1194 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -394,7 +394,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
394 394
395 if (!elm_widget_can_focus_get(obj)) return EINA_FALSE; 395 if (!elm_widget_can_focus_get(obj)) return EINA_FALSE;
396 396
397 if (elm_widget_focus_get(obj)) 397 if (efl_ui_focus_object_focus_get(obj))
398 { 398 {
399 elm_layout_signal_emit(obj, "elm,action,focus", "elm"); 399 elm_layout_signal_emit(obj, "elm,action,focus", "elm");
400 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 400 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index 0ff7c5e555..d39d68c470 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -146,11 +146,11 @@ _visual_guide_text_set(Evas_Object *obj)
146 elm_box_unpack(sd->box, sd->entry); 146 elm_box_unpack(sd->box, sd->entry);
147 if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return; 147 if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
148 148
149 if (!elm_widget_focus_get(obj)) 149 if (!efl_ui_focus_object_focus_get(obj))
150 elm_object_focus_set(sd->entry, EINA_FALSE); 150 elm_object_focus_set(sd->entry, EINA_FALSE);
151 151
152 if ((!eina_list_count(sd->items)) && sd->guide_text 152 if ((!eina_list_count(sd->items)) && sd->guide_text
153 && (!elm_widget_focus_get(obj)) && (!sd->n_str)) 153 && (!efl_ui_focus_object_focus_get(obj)) && (!sd->n_str))
154 { 154 {
155 evas_object_hide(sd->entry); 155 evas_object_hide(sd->entry);
156 elm_box_pack_end(sd->box, sd->guide_text); 156 elm_box_pack_end(sd->box, sd->guide_text);
@@ -165,7 +165,7 @@ _visual_guide_text_set(Evas_Object *obj)
165 { 165 {
166 elm_box_pack_end(sd->box, sd->entry); 166 elm_box_pack_end(sd->box, sd->entry);
167 evas_object_show(sd->entry); 167 evas_object_show(sd->entry);
168 if (elm_widget_focus_get(obj)) 168 if (efl_ui_focus_object_focus_get(obj))
169 { 169 {
170 if (!sd->selected_it) 170 if (!sd->selected_it)
171 elm_object_focus_set(sd->entry, EINA_TRUE); 171 elm_object_focus_set(sd->entry, EINA_TRUE);
@@ -448,7 +448,7 @@ _item_select(Evas_Object *obj,
448 448
449 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it)); 449 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
450 450
451 if (elm_widget_focus_get(obj)) 451 if (efl_ui_focus_object_focus_get(obj))
452 { 452 {
453 elm_object_focus_set(sd->entry, EINA_FALSE); 453 elm_object_focus_set(sd->entry, EINA_FALSE);
454 elm_object_focus_set(VIEW(it), EINA_TRUE); 454 elm_object_focus_set(VIEW(it), EINA_TRUE);
@@ -479,7 +479,7 @@ _item_select(Evas_Object *obj,
479 { 479 {
480 _current_item_state_change 480 _current_item_state_change
481 (obj, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT); 481 (obj, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT);
482 if (elm_widget_focus_get(obj) && sd->editable) 482 if (efl_ui_focus_object_focus_get(obj) && sd->editable)
483 elm_object_focus_set(sd->entry, EINA_TRUE); 483 elm_object_focus_set(sd->entry, EINA_TRUE);
484 } 484 }
485} 485}
@@ -1039,7 +1039,7 @@ _entry_resize_cb(void *data,
1039{ 1039{
1040 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1040 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1041 1041
1042 if (elm_widget_focus_get(sd->parent)) 1042 if (efl_ui_focus_object_focus_get(sd->parent))
1043 elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), EINA_TRUE); 1043 elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), EINA_TRUE);
1044} 1044}
1045 1045
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 0af9a787f2..1474664df7 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -313,7 +313,7 @@ _drag_start(void *data,
313 const char *emission EINA_UNUSED, 313 const char *emission EINA_UNUSED,
314 const char *source EINA_UNUSED) 314 const char *source EINA_UNUSED)
315{ 315{
316 if (!elm_widget_focus_get(data)) 316 if (!efl_ui_focus_object_focus_get(data))
317 elm_object_focus_set(data, EINA_TRUE); 317 elm_object_focus_set(data, EINA_TRUE);
318 _slider_update(data, EINA_TRUE); 318 _slider_update(data, EINA_TRUE);
319 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL); 319 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
@@ -415,7 +415,7 @@ _popup_hide(void *data,
415 415
416 if (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS) return; 416 if (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS) return;
417 if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && 417 if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) &&
418 elm_widget_focus_get(data)) 418 efl_ui_focus_object_focus_get(data))
419 return; 419 return;
420 420
421 edje_object_signal_emit(sd->popup, "popup,hide", "elm"); // XXX: for compat 421 edje_object_signal_emit(sd->popup, "popup,hide", "elm"); // XXX: for compat
@@ -437,7 +437,7 @@ _popup_hide_done(void *data,
437 EFL_UI_SLIDER_DATA_GET(data, sd); 437 EFL_UI_SLIDER_DATA_GET(data, sd);
438 if (sd->popup) 438 if (sd->popup)
439 { 439 {
440 if (!((elm_widget_focus_get(data)) && 440 if (!((efl_ui_focus_object_focus_get(data)) &&
441 (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS))) 441 (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS)))
442 { 442 {
443 evas_object_hide(sd->popup); 443 evas_object_hide(sd->popup);
@@ -446,7 +446,7 @@ _popup_hide_done(void *data,
446 } 446 }
447 if (sd->popup2) 447 if (sd->popup2)
448 { 448 {
449 if (!((elm_widget_focus_get(data)) && 449 if (!((efl_ui_focus_object_focus_get(data)) &&
450 (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS))) 450 (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS)))
451 { 451 {
452 evas_object_hide(sd->popup2); 452 evas_object_hide(sd->popup2);
@@ -901,7 +901,7 @@ _spacer_down_cb(void *data,
901 901
902 _move_knob_on_mouse(data, button_x, button_y); 902 _move_knob_on_mouse(data, button_x, button_y);
903 903
904 if (!elm_widget_focus_get(data)) 904 if (!efl_ui_focus_object_focus_get(data))
905 elm_object_focus_set(data, EINA_TRUE); 905 elm_object_focus_set(data, EINA_TRUE);
906 _slider_update(data, EINA_TRUE); 906 _slider_update(data, EINA_TRUE);
907 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL); 907 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
@@ -1255,9 +1255,9 @@ _efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_U
1255 1255
1256 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 1256 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
1257 1257
1258 if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj)) 1258 if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && efl_ui_focus_object_focus_get(obj))
1259 _popup_show(obj, NULL, NULL, NULL); 1259 _popup_show(obj, NULL, NULL, NULL);
1260 else if (!elm_widget_focus_get(obj)) 1260 else if (!efl_ui_focus_object_focus_get(obj))
1261 _popup_hide(obj, NULL, NULL, NULL); 1261 _popup_hide(obj, NULL, NULL, NULL);
1262 1262
1263 return int_ret; 1263 return int_ret;
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 21b0e28072..23e149af32 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -571,7 +571,7 @@ _efl_ui_spin_button_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data
571 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 571 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
572 if (!int_ret) return EINA_FALSE; 572 if (!int_ret) return EINA_FALSE;
573 573
574 if (!elm_widget_focus_get(obj)) 574 if (!efl_ui_focus_object_focus_get(obj))
575 { 575 {
576 ELM_SAFE_FREE(sd->delay_change_timer, ecore_timer_del); 576 ELM_SAFE_FREE(sd->delay_change_timer, ecore_timer_del);
577 ELM_SAFE_FREE(sd->spin_timer, ecore_timer_del); 577 ELM_SAFE_FREE(sd->spin_timer, ecore_timer_del);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 05619dccc9..c44ccb391f 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -963,7 +963,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
963 // and one of them can delete elm_entry. 963 // and one of them can delete elm_entry.
964 evas_object_ref(obj); 964 evas_object_ref(obj);
965 965
966 if (elm_widget_focus_get(obj)) 966 if (efl_ui_focus_object_focus_get(obj))
967 { 967 {
968 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm"); 968 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
969 if (sd->scroll) 969 if (sd->scroll)
@@ -1200,7 +1200,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
1200 if (top && efl_isa(top, EFL_UI_WIN_CLASS)) 1200 if (top && efl_isa(top, EFL_UI_WIN_CLASS))
1201 top_is_win = EINA_TRUE; 1201 top_is_win = EINA_TRUE;
1202 1202
1203 if (elm_widget_focus_get(obj)) 1203 if (efl_ui_focus_object_focus_get(obj))
1204 { 1204 {
1205 Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); 1205 Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
1206 evas_object_focus_set(sw, EINA_TRUE); 1206 evas_object_focus_set(sw, EINA_TRUE);
@@ -2243,7 +2243,7 @@ _entry_cursor_changed_signal_cb(void *data,
2243 sd->cursor_pos = edje_object_part_text_cursor_pos_get 2243 sd->cursor_pos = edje_object_part_text_cursor_pos_get
2244 (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); 2244 (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
2245 sd->cur_changed = EINA_TRUE; 2245 sd->cur_changed = EINA_TRUE;
2246 if (elm_widget_focus_get(data)) 2246 if (efl_ui_focus_object_focus_get(data))
2247 { 2247 {
2248 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm"); 2248 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm");
2249 } 2249 }
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index ba35fee7ec..2c89a4e77a 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1666,9 +1666,9 @@ _efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_
1666 return EINA_TRUE; 1666 return EINA_TRUE;
1667 1667
1668 if (sd->img_obj) 1668 if (sd->img_obj)
1669 evas_object_focus_set(sd->img_obj, elm_widget_focus_get(obj)); 1669 evas_object_focus_set(sd->img_obj, efl_ui_focus_object_focus_get(obj));
1670 else 1670 else
1671 evas_object_focus_set(obj, elm_widget_focus_get(obj)); 1671 evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));
1672 1672
1673 return EINA_TRUE; 1673 return EINA_TRUE;
1674} 1674}
@@ -6379,7 +6379,7 @@ _efl_ui_win_indicator_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNU
6379} 6379}
6380 6380
6381EOLIAN static Eina_Bool 6381EOLIAN static Eina_Bool
6382_efl_ui_win_elm_widget_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6382_efl_ui_win_efl_ui_focus_object_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6383{ 6383{
6384 // Bypass widget implementation here. 6384 // Bypass widget implementation here.
6385 return ecore_evas_focus_get(sd->ee); 6385 return ecore_evas_focus_get(sd->ee);
@@ -8390,7 +8390,7 @@ elm_win_socket_listen(Efl_Ui_Win *obj, const char *svcname, int svcnum, Eina_Boo
8390EAPI Eina_Bool 8390EAPI Eina_Bool
8391elm_win_focus_get(const Efl_Ui_Win *obj) 8391elm_win_focus_get(const Efl_Ui_Win *obj)
8392{ 8392{
8393 return efl_ui_widget_focus_get(obj); 8393 return efl_ui_focus_object_focus_get(obj);
8394} 8394}
8395 8395
8396EAPI void 8396EAPI void
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 01181a53e8..64f13b5797 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -583,7 +583,7 @@ EOLIAN static Eina_Bool
583_elm_hoversel_item_elm_widget_item_focus_get(Eo *eo_it EINA_UNUSED, 583_elm_hoversel_item_elm_widget_item_focus_get(Eo *eo_it EINA_UNUSED,
584 Elm_Hoversel_Item_Data *it) 584 Elm_Hoversel_Item_Data *it)
585{ 585{
586 return elm_widget_focus_get(VIEW(it)); 586 return efl_ui_focus_object_focus_get(VIEW(it));
587} 587}
588 588
589EOLIAN static void 589EOLIAN static void
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index abe81e34f2..99b9ad0c58 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -147,7 +147,7 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui
147EOLIAN static Eina_Bool 147EOLIAN static Eina_Bool
148_elm_access_elm_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 148_elm_access_elm_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
149{ 149{
150 evas_object_focus_set(obj, elm_widget_focus_get(obj)); 150 evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));
151 151
152 return EINA_TRUE; 152 return EINA_TRUE;
153} 153}
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 11acf528ca..2aff58223b 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1393,7 +1393,7 @@ _elm_calendar_elm_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Obj
1393 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 1393 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
1394 if (!int_ret) return EINA_FALSE; 1394 if (!int_ret) return EINA_FALSE;
1395 1395
1396 if (elm_widget_focus_get(obj)) 1396 if (efl_ui_focus_object_focus_get(obj))
1397 _update_focused_it(obj, sd->selected_it); 1397 _update_focused_it(obj, sd->selected_it);
1398 else 1398 else
1399 _update_unfocused_it(obj, sd->focused_it); 1399 _update_unfocused_it(obj, sd->focused_it);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 97a0ad14d4..c51641e416 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -2648,7 +2648,7 @@ _elm_color_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Color_Item_Data *it, Ei
2648 } 2648 }
2649 else 2649 else
2650 { 2650 {
2651 if (!elm_widget_focus_get(obj)) 2651 if (!efl_ui_focus_object_focus_get(obj))
2652 return; 2652 return;
2653 sd->focused_item = NULL; 2653 sd->focused_item = NULL;
2654 } 2654 }
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index e26451327e..1a96a8ce61 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -905,7 +905,7 @@ _elm_diskselector_elm_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd
905 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 905 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
906 if (!int_ret) return EINA_FALSE; 906 if (!int_ret) return EINA_FALSE;
907 907
908 if (elm_widget_focus_get(obj)) 908 if (efl_ui_focus_object_focus_get(obj))
909 { 909 {
910 edje_object_signal_emit 910 edje_object_signal_emit
911 (wd->resize_obj, "elm,action,focus", "elm"); 911 (wd->resize_obj, "elm,action,focus", "elm");
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 56c8c305db..ad70e9b039 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -932,7 +932,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
932 // and one of them can delete elm_entry. 932 // and one of them can delete elm_entry.
933 evas_object_ref(obj); 933 evas_object_ref(obj);
934 934
935 if (elm_widget_focus_get(obj)) 935 if (efl_ui_focus_object_focus_get(obj))
936 { 936 {
937 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm"); 937 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
938 if (sd->scroll) 938 if (sd->scroll)
@@ -2413,7 +2413,7 @@ _entry_cursor_changed_signal_cb(void *data,
2413 sd->cursor_pos = edje_object_part_text_cursor_pos_get 2413 sd->cursor_pos = edje_object_part_text_cursor_pos_get
2414 (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); 2414 (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
2415 sd->cur_changed = EINA_TRUE; 2415 sd->cur_changed = EINA_TRUE;
2416 if (elm_widget_focus_get(data)) 2416 if (efl_ui_focus_object_focus_get(data))
2417 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm"); 2417 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm");
2418 _cursor_geometry_recalc(data); 2418 _cursor_geometry_recalc(data);
2419 2419
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 0aaabfdd11..8f5615fbd7 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3805,7 +3805,7 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo
3805 } 3805 }
3806 else 3806 else
3807 { 3807 {
3808 if (!elm_widget_focus_get(obj)) 3808 if (!efl_ui_focus_object_focus_get(obj))
3809 return; 3809 return;
3810 _elm_gengrid_item_unfocused(eo_it); 3810 _elm_gengrid_item_unfocused(eo_it);
3811 } 3811 }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index f21da6d66c..9ae57c1ef5 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3375,13 +3375,13 @@ _elm_genlist_elm_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd, Elm_Objec
3375 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 3375 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
3376 if (!int_ret) return EINA_FALSE; 3376 if (!int_ret) return EINA_FALSE;
3377 3377
3378 if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) && 3378 if (efl_ui_focus_object_focus_get(obj) && (sd->items) && (sd->selected) &&
3379 (!sd->last_selected_item)) 3379 (!sd->last_selected_item))
3380 { 3380 {
3381 sd->last_selected_item = eina_list_data_get(sd->selected); 3381 sd->last_selected_item = eina_list_data_get(sd->selected);
3382 } 3382 }
3383 3383
3384 if (elm_widget_focus_get(obj) && !sd->mouse_down) 3384 if (efl_ui_focus_object_focus_get(obj) && !sd->mouse_down)
3385 { 3385 {
3386 if (sd->last_focused_item) 3386 if (sd->last_focused_item)
3387 eo_it = sd->last_focused_item; 3387 eo_it = sd->last_focused_item;
@@ -6132,7 +6132,7 @@ _elm_genlist_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo
6132 if (!elm_object_focus_get(obj)) 6132 if (!elm_object_focus_get(obj))
6133 elm_object_focus_set(obj, EINA_TRUE); 6133 elm_object_focus_set(obj, EINA_TRUE);
6134 6134
6135 if (!elm_widget_focus_get(obj)) 6135 if (!efl_ui_focus_object_focus_get(obj))
6136 return; 6136 return;
6137 6137
6138 if (eo_it != sd->focused_item) 6138 if (eo_it != sd->focused_item)
@@ -6152,7 +6152,7 @@ _elm_genlist_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo
6152 } 6152 }
6153 else 6153 else
6154 { 6154 {
6155 if (!elm_widget_focus_get(obj)) 6155 if (!efl_ui_focus_object_focus_get(obj))
6156 return; 6156 return;
6157 _elm_genlist_item_unfocused(eo_it); 6157 _elm_genlist_item_unfocused(eo_it);
6158 } 6158 }
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index d1a96f5269..0201b61858 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -35,7 +35,7 @@ _elm_glview_elm_widget_on_focus_update(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED
35 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 35 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
36 if (!int_ret) return EINA_FALSE; 36 if (!int_ret) return EINA_FALSE;
37 37
38 if (elm_widget_focus_get(obj)) 38 if (efl_ui_focus_object_focus_get(obj))
39 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 39 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
40 else 40 else
41 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 41 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 35219faabc..1b7f239abf 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1245,7 +1245,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item
1245 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 1245 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
1246 if (!int_ret) return EINA_FALSE; 1246 if (!int_ret) return EINA_FALSE;
1247 1247
1248 if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item) 1248 if (efl_ui_focus_object_focus_get(obj) && sd->selected && !sd->last_selected_item)
1249 { 1249 {
1250 Elm_Object_Item *sel = eina_list_data_get(sd->selected); 1250 Elm_Object_Item *sel = eina_list_data_get(sd->selected);
1251 sd->last_selected_item = efl_data_scope_get(sel, ELM_LIST_ITEM_CLASS); 1251 sd->last_selected_item = efl_data_scope_get(sel, ELM_LIST_ITEM_CLASS);
@@ -1253,7 +1253,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item
1253 1253
1254 if (!sd->items) return EINA_FALSE; 1254 if (!sd->items) return EINA_FALSE;
1255 1255
1256 if (elm_widget_focus_get(obj) && !sd->mouse_down) 1256 if (efl_ui_focus_object_focus_get(obj) && !sd->mouse_down)
1257 { 1257 {
1258 if (sd->last_focused_item) 1258 if (sd->last_focused_item)
1259 eo_it = sd->last_focused_item; 1259 eo_it = sd->last_focused_item;
@@ -2070,7 +2070,7 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina
2070 if (!elm_object_focus_get(obj)) 2070 if (!elm_object_focus_get(obj))
2071 elm_object_focus_set(obj, EINA_TRUE); 2071 elm_object_focus_set(obj, EINA_TRUE);
2072 2072
2073 if (!elm_widget_focus_get(obj)) 2073 if (!efl_ui_focus_object_focus_get(obj))
2074 return; 2074 return;
2075 2075
2076 if (eo_it != sd->focused_item) 2076 if (eo_it != sd->focused_item)
@@ -2082,7 +2082,7 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina
2082 } 2082 }
2083 else 2083 else
2084 { 2084 {
2085 if (!elm_widget_focus_get(obj)) 2085 if (!efl_ui_focus_object_focus_get(obj))
2086 return; 2086 return;
2087 if (eo_it) 2087 if (eo_it)
2088 _elm_list_item_unfocused(eo_it); 2088 _elm_list_item_unfocused(eo_it);
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index de924766d8..7789b8b348 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1613,7 +1613,7 @@ elm_object_focus_get(const Evas_Object *obj)
1613 focused_child = efl_ui_focus_user_parent_get(focused_child); 1613 focused_child = efl_ui_focus_user_parent_get(focused_child);
1614 } 1614 }
1615 1615
1616 return elm_widget_focus_get(obj); 1616 return efl_ui_focus_object_focus_get(obj);
1617} 1617}
1618 1618
1619EAPI void 1619EAPI void
@@ -2080,4 +2080,4 @@ EAPI Elm_Focus_Region_Show_Mode
2080elm_object_focus_region_show_mode_get(const Evas_Object *obj) 2080elm_object_focus_region_show_mode_get(const Evas_Object *obj)
2081{ 2081{
2082 return elm_widget_focus_region_show_mode_get(obj); 2082 return elm_widget_focus_region_show_mode_get(obj);
2083} 2083} \ No newline at end of file
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 1b14288a04..13b5521b96 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3953,7 +3953,7 @@ _elm_map_elm_widget_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_
3953 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 3953 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
3954 if (!int_ret) return EINA_FALSE; 3954 if (!int_ret) return EINA_FALSE;
3955 3955
3956 if (elm_widget_focus_get(obj)) 3956 if (efl_ui_focus_object_focus_get(obj))
3957 { 3957 {
3958 edje_object_signal_emit 3958 edje_object_signal_emit
3959 (wd->resize_obj, "elm,action,focus", "elm"); 3959 (wd->resize_obj, "elm,action,focus", "elm");
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 9fe640654e..62bb83b90c 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -68,7 +68,7 @@ _elm_plug_elm_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED, Elm_Object_I
68 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 68 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
69 if (!int_ret) return EINA_FALSE; 69 if (!int_ret) return EINA_FALSE;
70 70
71 if (elm_widget_focus_get(obj)) 71 if (efl_ui_focus_object_focus_get(obj))
72 { 72 {
73 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 73 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
74 } 74 }
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index b1de7efde1..ab7bab3de6 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -937,7 +937,7 @@ _elm_spinner_elm_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd, Elm_Objec
937 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 937 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
938 if (!int_ret) return EINA_FALSE; 938 if (!int_ret) return EINA_FALSE;
939 939
940 if (!elm_widget_focus_get(obj)) 940 if (!efl_ui_focus_object_focus_get(obj))
941 { 941 {
942 ELM_SAFE_FREE(sd->delay_change_timer, ecore_timer_del); 942 ELM_SAFE_FREE(sd->delay_change_timer, ecore_timer_del);
943 ELM_SAFE_FREE(sd->spin_timer, ecore_timer_del); 943 ELM_SAFE_FREE(sd->spin_timer, ecore_timer_del);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index a9a0835a16..e7df14afad 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -756,7 +756,7 @@ _elm_toolbar_elm_widget_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd, Elm_Objec
756 if (!int_ret) return EINA_FALSE; 756 if (!int_ret) return EINA_FALSE;
757 if (!sd->items) return EINA_FALSE; 757 if (!sd->items) return EINA_FALSE;
758 758
759 if (elm_widget_focus_get(obj)) 759 if (efl_ui_focus_object_focus_get(obj))
760 { 760 {
761 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 761 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
762 if (sd->mouse_down) return EINA_TRUE; 762 if (sd->mouse_down) return EINA_TRUE;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 2633f2e53e..d174bf7dca 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -44,7 +44,7 @@
44#define ELM_WIDGET_FOCUS_GET(obj) \ 44#define ELM_WIDGET_FOCUS_GET(obj) \
45 (efl_isa(obj, ELM_WIDGET_CLASS) && \ 45 (efl_isa(obj, ELM_WIDGET_CLASS) && \
46 ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \ 46 ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \
47 (elm_widget_focus_get(obj)))) 47 (efl_ui_focus_object_focus_get(obj))))
48 48
49const char SIG_WIDGET_FOCUSED[] = "focused"; 49const char SIG_WIDGET_FOCUSED[] = "focused";
50const char SIG_WIDGET_UNFOCUSED[] = "unfocused"; 50const char SIG_WIDGET_UNFOCUSED[] = "unfocused";
@@ -1918,12 +1918,6 @@ elm_widget_access_highlight_in_theme_get(const Eo *obj)
1918 return sd->access_highlight_in_theme; 1918 return sd->access_highlight_in_theme;
1919} 1919}
1920 1920
1921EOLIAN static Eina_Bool
1922_elm_widget_focus_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
1923{
1924 return (sd->focused && sd->top_win_focused);
1925}
1926
1927/** @internal */ 1921/** @internal */
1928EAPI Eina_Bool 1922EAPI Eina_Bool
1929elm_widget_highlight_get(const Eo *obj) 1923elm_widget_highlight_get(const Eo *obj)
@@ -4970,7 +4964,7 @@ _sub_obj_tree_dot_dump(const Evas_Object *obj,
4970 4964
4971 Eina_Bool visible = evas_object_visible_get(obj); 4965 Eina_Bool visible = evas_object_visible_get(obj);
4972 Eina_Bool disabled = elm_widget_disabled_get(obj); 4966 Eina_Bool disabled = elm_widget_disabled_get(obj);
4973 Eina_Bool focused = elm_widget_focus_get(obj); 4967 Eina_Bool focused = efl_ui_focus_object_focus_get(obj);
4974 Eina_Bool can_focus = elm_widget_can_focus_get(obj); 4968 Eina_Bool can_focus = elm_widget_can_focus_get(obj);
4975 4969
4976 if (sd->parent_obj) 4970 if (sd->parent_obj)
@@ -5124,7 +5118,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI
5124{ 5118{
5125 const char *focus = ""; 5119 const char *focus = "";
5126 5120
5127 if (efl_ui_widget_focus_get(obj)) focus = ":focused"; 5121 if (efl_ui_focus_object_focus_get(obj)) focus = ":focused";
5128 efl_debug_name_override(efl_super(obj, MY_CLASS), sb); 5122 efl_debug_name_override(efl_super(obj, MY_CLASS), sb);
5129 eina_strbuf_append_printf(sb, "%s", focus); 5123 eina_strbuf_append_printf(sb, "%s", focus);
5130} 5124}
@@ -5137,7 +5131,7 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item
5137 if (!elm_widget_can_focus_get(obj)) 5131 if (!elm_widget_can_focus_get(obj))
5138 return EINA_FALSE; 5132 return EINA_FALSE;
5139 5133
5140 focused = elm_widget_focus_get(obj); 5134 focused = efl_ui_focus_object_focus_get(obj);
5141 5135
5142 if (!sd->resize_obj) 5136 if (!sd->resize_obj)
5143 evas_object_focus_set(obj, focused); 5137 evas_object_focus_set(obj, focused);
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 6a03f4be8c..6752380ce1 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -134,22 +134,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
134 disabled: bool(false); [[$true if the orientation mode is disabled.]] 134 disabled: bool(false); [[$true if the orientation mode is disabled.]]
135 } 135 }
136 } 136 }
137 // FIXME: This property may be simply removed from EO (replaced by focus manager stuff)
138 @property focus {
139 [[Whether the object is focused for inputs.
140
141 If an object is focused it will be the first to receive keyboard
142 inputs. Only visible, non-disabled objects can be focused.
143
144 Focus can be disabled by setting @.focus_allow to $false.
145 ]]
146 get {
147 [[Gets whether this object is currently focused.]]
148 }
149 values {
150 focus: bool(false); [[Whether the object is focused.]]
151 }
152 }
153 // FIXME: focus_allow? can_focus? focusable? 137 // FIXME: focus_allow? can_focus? focusable?
154 @property focus_allow { 138 @property focus_allow {
155 [[The ability for a widget to be focused. 139 [[The ability for a widget to be focused.
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index abc92795a8..6f28a6997f 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -56,7 +56,7 @@
56 * // define this virtual function to handle it (e.g. to emit a 56 * // define this virtual function to handle it (e.g. to emit a
57 * // signal to an edje object) 57 * // signal to an edje object)
58 * 58 *
59 * if (elm_widget_focus_get(obj)) 59 * if (efl_ui_focus_object_focus_get(obj))
60 * { 60 * {
61 * edje_object_signal_emit(sd->sub, "elm,action,focus", "elm"); 61 * edje_object_signal_emit(sd->sub, "elm,action,focus", "elm");
62 * evas_object_focus_set(sd->sub, EINA_TRUE); 62 * evas_object_focus_set(sd->sub, EINA_TRUE);
@@ -660,7 +660,6 @@ EAPI void elm_widget_highlight_in_theme_set(Evas_Object *obj, Eina_B
660EAPI Eina_Bool elm_widget_highlight_in_theme_get(const Evas_Object *obj); 660EAPI Eina_Bool elm_widget_highlight_in_theme_get(const Evas_Object *obj);
661EAPI void elm_widget_access_highlight_in_theme_set(Evas_Object *obj, Eina_Bool highlight); 661EAPI void elm_widget_access_highlight_in_theme_set(Evas_Object *obj, Eina_Bool highlight);
662EAPI Eina_Bool elm_widget_access_highlight_in_theme_get(const Evas_Object *obj); 662EAPI Eina_Bool elm_widget_access_highlight_in_theme_get(const Evas_Object *obj);
663EAPI Eina_Bool elm_widget_focus_get(const Evas_Object *obj);
664EAPI Eina_Bool elm_widget_highlight_get(const Evas_Object *obj); 663EAPI Eina_Bool elm_widget_highlight_get(const Evas_Object *obj);
665EAPI Evas_Object *elm_widget_top_get(const Evas_Object *obj); 664EAPI Evas_Object *elm_widget_top_get(const Evas_Object *obj);
666EAPI Eina_Bool elm_widget_is(const Evas_Object *obj); 665EAPI Eina_Bool elm_widget_is(const Evas_Object *obj);