discomfitor pushed a commit to branch elementary-1.17.
http://git.enlightenment.org/core/elementary.git/commit/?id=79a1b3a9e33da29e4e9b0c1034f7dc566a2152db
commit 79a1b3a9e33da29e4e9b0c1034f7dc566a2152db
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Thu Feb 25 18:01:54 2016 -0500
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
---
src/lib/elm_list.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 5788c9d..429daf2 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++;
}
--
