summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-31 15:15:58 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-01 10:09:37 +0900
commit89492d859ba6c94df28ad0549b754ee0b005c82a (patch)
tree9267601165e60408774bc9048932535ba2989db2 /src/lib/elementary/efl_ui_win.c
parent4b74ca477d261d89e798f75612d848e14168d8f6 (diff)
win: Merge focus with elm_widget's (EO)
I believe this should work fine! Ref T5363 Ref T5322
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index ce5986c645..670139d61d 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1701,9 +1701,8 @@ _efl_ui_win_elm_widget_focus_direction(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED
1701EOLIAN static Eina_Bool 1701EOLIAN static Eina_Bool
1702_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED) 1702_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
1703{ 1703{
1704 Eina_Bool int_ret = EINA_FALSE; 1704 if (!elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL))
1705 int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL); 1705 return EINA_TRUE;
1706 if (!int_ret) return EINA_TRUE;
1707 1706
1708 if (sd->img_obj) 1707 if (sd->img_obj)
1709 evas_object_focus_set(sd->img_obj, elm_widget_focus_get(obj)); 1708 evas_object_focus_set(sd->img_obj, elm_widget_focus_get(obj));
@@ -6177,8 +6176,9 @@ _efl_ui_win_indicator_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNU
6177} 6176}
6178 6177
6179EOLIAN static Eina_Bool 6178EOLIAN static Eina_Bool
6180_efl_ui_win_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6179_efl_ui_win_elm_widget_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6181{ 6180{
6181 // Bypass widget implementation here.
6182 return ecore_evas_focus_get(sd->ee); 6182 return ecore_evas_focus_get(sd->ee);
6183} 6183}
6184 6184
@@ -8157,6 +8157,12 @@ elm_win_socket_listen(Efl_Ui_Win *obj, const char *svcname, int svcnum, Eina_Boo
8157 return efl_ui_win_socket_listen(obj, svcname, svcnum, svcsys); 8157 return efl_ui_win_socket_listen(obj, svcname, svcnum, svcsys);
8158} 8158}
8159 8159
8160EAPI Eina_Bool
8161elm_win_focus_get(const Efl_Ui_Win *obj)
8162{
8163 return elm_obj_widget_focus_get(obj);
8164}
8165
8160// deprecated 8166// deprecated
8161 8167
8162EAPI void 8168EAPI void