diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-02-25 18:01:54 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-03-02 13:32:24 -0500 |
| commit | 79a1b3a9e33da29e4e9b0c1034f7dc566a2152db (patch) | |
| tree | 6a1233363fb180b6233e9106b4920eef49ebccf8 | |
| parent | ac383f4cb1a4ef520f7ac2aa11ad5387a22875f0 (diff) | |
| download | elementary-79a1b3a9e33da29e4e9b0c1034f7dc566a2152db.tar.gz | |
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.c | 29 |
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) evas_object_color_set(it->end, 0, 0, 0, 0); it->dummy_end = EINA_TRUE; } - if (it->icon) - { - evas_object_size_hint_min_set(it->icon, minw[0], minh[0]); - evas_object_size_hint_max_set(it->icon, 99999, 99999); - edje_object_part_swallow - (VIEW(it), "elm.swallow.icon", it->icon); - } - if (it->end) - { - evas_object_size_hint_min_set(it->end, minw[1], minh[1]); - evas_object_size_hint_max_set(it->end, 99999, 99999); - edje_object_part_swallow - (VIEW(it), "elm.swallow.end", it->end); - } if (eina_list_count(sd->items) == 1) { edje_object_signal_emit @@ -1016,7 +1002,20 @@ _items_fix(Evas_Object *obj) it->fixed = EINA_TRUE; it->is_even = it->even; } - + if (it->icon) + { + evas_object_size_hint_min_set(it->icon, minw[0], minh[0]); + evas_object_size_hint_max_set(it->icon, 99999, 99999); + edje_object_part_swallow + (VIEW(it), "elm.swallow.icon", it->icon); + } + if (it->end) + { + evas_object_size_hint_min_set(it->end, minw[1], minh[1]); + evas_object_size_hint_max_set(it->end, 99999, 99999); + edje_object_part_swallow + (VIEW(it), "elm.swallow.end", it->end); + } if (!it->is_separator) i++; } |