bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bed67ef0d0c43367a5a704f447f09e0550efaa7c
commit bed67ef0d0c43367a5a704f447f09e0550efaa7c
Author: Marcel Hollerbach <mar...@osg.samsung.com>
Date: Sun Nov 26 19:29:36 2017 +0100
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!
---
src/lib/elementary/elm_main.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index cea2061abe..de924766d8 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -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);
--
