summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-02-25 18:01:54 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-25 18:03:18 -0500
commitfb551c7a3217805f83465bcec91cf25b28c77c49 (patch)
treedb6f8b615402da6b35db2c17d67aa55d0cdcdd44
parent9486c8f6d152f2ce933726573cbd9a47139e34b6 (diff)
list: always apply new size hints for subobjects
if a content's size hints change, reapplying the list's size hints to override existing hints is required to prevent some list items from having a bad layout @fix
-rw-r--r--src/lib/elm_list.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 5788c9dc5..429daf254 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -934,20 +934,6 @@ _items_fix(Evas_Object *obj)
934 evas_object_color_set(it->end, 0, 0, 0, 0); 934 evas_object_color_set(it->end, 0, 0, 0, 0);
935 it->dummy_end = EINA_TRUE; 935 it->dummy_end = EINA_TRUE;
936 } 936 }
937 if (it->icon)
938 {
939 evas_object_size_hint_min_set(it->icon, minw[0], minh[0]);
940 evas_object_size_hint_max_set(it->icon, 99999, 99999);
941 edje_object_part_swallow
942 (VIEW(it), "elm.swallow.icon", it->icon);
943 }
944 if (it->end)
945 {
946 evas_object_size_hint_min_set(it->end, minw[1], minh[1]);
947 evas_object_size_hint_max_set(it->end, 99999, 99999);
948 edje_object_part_swallow
949 (VIEW(it), "elm.swallow.end", it->end);
950 }
951 if (eina_list_count(sd->items) == 1) 937 if (eina_list_count(sd->items) == 1)
952 { 938 {
953 edje_object_signal_emit 939 edje_object_signal_emit
@@ -1016,7 +1002,20 @@ _items_fix(Evas_Object *obj)
1016 it->fixed = EINA_TRUE; 1002 it->fixed = EINA_TRUE;
1017 it->is_even = it->even; 1003 it->is_even = it->even;
1018 } 1004 }
1019 1005 if (it->icon)
1006 {
1007 evas_object_size_hint_min_set(it->icon, minw[0], minh[0]);
1008 evas_object_size_hint_max_set(it->icon, 99999, 99999);
1009 edje_object_part_swallow
1010 (VIEW(it), "elm.swallow.icon", it->icon);
1011 }
1012 if (it->end)
1013 {
1014 evas_object_size_hint_min_set(it->end, minw[1], minh[1]);
1015 evas_object_size_hint_max_set(it->end, 99999, 99999);
1016 edje_object_part_swallow
1017 (VIEW(it), "elm.swallow.end", it->end);
1018 }
1020 if (!it->is_separator) 1019 if (!it->is_separator)
1021 i++; 1020 i++;
1022 } 1021 }