elm - fix focus set on focus in on window due to previous focus fix

this fix is a fix due to the fix in
933dfca5bcda4943ecdd81ab09dc34989234f7f3 whihc fixed other issues. now
focus is properly set where it should be. this affected rage

@fix
This commit is contained in:
Carsten Haitzler 2015-09-21 16:13:41 +09:00
parent a45c1c802c
commit 97ead86a39
1 changed files with 8 additions and 2 deletions

View File

@ -1087,9 +1087,15 @@ _elm_win_focus_in(Ecore_Evas *ee)
newest = elm_widget_newest_focus_order_get
(obj, &newest_focus_order, EINA_TRUE);
if ((newest) &&
_elm_win_focus_highlight_object_get(obj) &&
_elm_widget_onscreen_is(newest))
elm_widget_focus_restore(obj);
{
if (_elm_win_focus_highlight_object_get(obj))
elm_widget_focus_restore(obj);
else if (!elm_object_focus_get(newest))
elm_widget_focus_restore(obj);
else
evas_object_focus_set(obj, EINA_TRUE);
}
else
evas_object_focus_set(obj, EINA_TRUE);
}