From a0605b196c8ca6b501eb28e850c4c7d7a217c5d1 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sat, 13 Jul 2013 15:45:44 +0900 Subject: [PATCH] elm_list.c: fixed elm_object_item_part_content_set bug with 'end' part in elm_list. --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elm_list.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 317705754c..1a454be79b 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1499,3 +1499,7 @@ 2013-07-12 Guilherme Íscaro * Add elm_dayselector_wekdays_names_set/get + +2013-07-13 Daniel Juyung Seo + + * Fix elm_object_item_part_content_set bug with end content in elm_list. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 72ff2bff51..fd0450f83f 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -260,6 +260,7 @@ Fixes: * Fix crash of elm_notify when timeout is zero. * Fix Segfault in elementary file_selector_example when closed * Fix Showing multiple popups in Entry. + * Fix elm_object_item_part_content_set bug with end content in elm_list. Removals: diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 52dc6d0a72..5b8610c004 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -1348,7 +1348,12 @@ _item_content_set_hook(Elm_Object_Item *it, *icon_p = content; if (VIEW(item)) - edje_object_part_swallow(VIEW(item), "elm.swallow.icon", content); + { + if (!strcmp(part, "start")) + edje_object_part_swallow(VIEW(item), "elm.swallow.icon", content); + else + edje_object_part_swallow(VIEW(item), "elm.swallow.end", content); + } } static Evas_Object *