orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: fix legacy code 

earlier elm_object_focused_object_get returned gengrid genlist toolbar
objects if a item of them is focused. This should fix that.

thank you @davemds for the report!
This commit is contained in:
Marcel Hollerbach 2017-11-26 19:29:36 +01:00
parent 83c292ffc4
commit bed67ef0d0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/elementary/elm_main.c
View File

@ -21,6 +21,10 @@
#include "ecore_internal.h"
#include "elm_interface_scrollable.h"
//we need those for legacy compatible code
#include "elm_genlist.eo.h"
#include "elm_gengrid.eo.h"
#define SEMI_BROKEN_QUICKLAUNCH 1
#ifdef __CYGWIN__
@ -1763,6 +1767,11 @@ elm_object_focused_object_get(const Evas_Object *obj)
while(efl_ui_focus_manager_redirect_get(man))
{
man = efl_ui_focus_manager_redirect_get(man);
// legacy compatible code, earlier those containers have not exposed theire items
if (efl_isa(man, ELM_GENGRID_CLASS) ||
efl_isa(man, ELM_TOOLBAR_CLASS) ||
efl_isa(man, ELM_GENLIST_CLASS)) return man;
}
return efl_ui_focus_manager_focus_get(man);