summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-11-26 19:29:36 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-11-26 19:47:05 +0100
commitbed67ef0d0c43367a5a704f447f09e0550efaa7c (patch)
treecda2f801590ae5fec9408142d34a246a7775f3f9
parent83c292ffc4b32d659a3a795d2f2711c9806cd1b3 (diff)
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!
-rw-r--r--src/lib/elementary/elm_main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index cea2061..de92476 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -21,6 +21,10 @@
21#include "ecore_internal.h" 21#include "ecore_internal.h"
22#include "elm_interface_scrollable.h" 22#include "elm_interface_scrollable.h"
23 23
24//we need those for legacy compatible code
25#include "elm_genlist.eo.h"
26#include "elm_gengrid.eo.h"
27
24#define SEMI_BROKEN_QUICKLAUNCH 1 28#define SEMI_BROKEN_QUICKLAUNCH 1
25 29
26#ifdef __CYGWIN__ 30#ifdef __CYGWIN__
@@ -1763,6 +1767,11 @@ elm_object_focused_object_get(const Evas_Object *obj)
1763 while(efl_ui_focus_manager_redirect_get(man)) 1767 while(efl_ui_focus_manager_redirect_get(man))
1764 { 1768 {
1765 man = efl_ui_focus_manager_redirect_get(man); 1769 man = efl_ui_focus_manager_redirect_get(man);
1770
1771 // legacy compatible code, earlier those containers have not exposed theire items
1772 if (efl_isa(man, ELM_GENGRID_CLASS) ||
1773 efl_isa(man, ELM_TOOLBAR_CLASS) ||
1774 efl_isa(man, ELM_GENLIST_CLASS)) return man;
1766 } 1775 }
1767 1776
1768 return efl_ui_focus_manager_focus_get(man); 1777 return efl_ui_focus_manager_focus_get(man);