aboutsummaryrefslogtreecommitdiffstats
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
parentgfx_size_hint: Fix int vs. double (EO) (diff)
downloadefl-89492d859ba6c94df28ad0549b754ee0b005c82a.tar.gz
win: Merge focus with elm_widget's (EO)
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-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
EOLIAN static Eina_Bool
_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
- Eina_Bool int_ret = EINA_FALSE;
- int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
- if (!int_ret) return EINA_TRUE;
+ if (!elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL))
+ return EINA_TRUE;
if (sd->img_obj)
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
}
EOLIAN static Eina_Bool
-_efl_ui_win_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
+_efl_ui_win_elm_widget_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
+ // Bypass widget implementation here.
return ecore_evas_focus_get(sd->ee);
}
@@ -8157,6 +8157,12 @@ elm_win_socket_listen(Efl_Ui_Win *obj, const char *svcname, int svcnum, Eina_Boo
return efl_ui_win_socket_listen(obj, svcname, svcnum, svcsys);
}
+EAPI Eina_Bool
+elm_win_focus_get(const Efl_Ui_Win *obj)
+{
+ return elm_obj_widget_focus_get(obj);
+}
+
// deprecated
EAPI void