summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-04-22 13:13:57 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2020-04-28 13:29:32 +0200
commit02ad4d18ba86c9160a6e75829a6ec16a9d79ef7c (patch)
treeff550842f1b147f32c2cecb8371acbb2f705b003 /src/lib/elementary
parent3614c4190d78ed3abce4b3e1e175342e6299a242 (diff)
elm/list: avoid erroring on non-elm item contents
putting raw evas and edje objects in here has historically been done, so handle it without errors Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11747
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_list.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 7414bd2559..4447ea2f05 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2328,8 +2328,11 @@ _item_new(Evas_Object *obj,
2328 evas_object_event_callback_add 2328 evas_object_event_callback_add
2329 (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, 2329 (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
2330 obj); 2330 obj);
2331 efl_access_object_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED); 2331 if (elm_widget_is(it->icon))
2332 elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE); 2332 {
2333 efl_access_object_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED);
2334 elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE);
2335 }
2333 } 2336 }
2334 if (it->end) 2337 if (it->end)
2335 { 2338 {
@@ -2337,8 +2340,11 @@ _item_new(Evas_Object *obj,
2337 evas_object_event_callback_add 2340 evas_object_event_callback_add
2338 (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, 2341 (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
2339 obj); 2342 obj);
2340 efl_access_object_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED); 2343 if (elm_widget_is(it->end))
2341 elm_widget_tree_unfocusable_set(it->end, EINA_TRUE); 2344 {
2345 efl_access_object_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED);
2346 elm_widget_tree_unfocusable_set(it->end, EINA_TRUE);
2347 }
2342 } 2348 }
2343 2349
2344 if (_elm_config->atspi_mode) 2350 if (_elm_config->atspi_mode)