From 605d04a302e709692aaa6c9b3d1aa2d76cd2d36e Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 28 Aug 2019 21:11:11 +0200 Subject: [PATCH] efl_ui_collection: use the correct min size hint there are not enough size hints, we should add more! I mixed up which size hints i should have used here, after some back and forth it turns out that i should use the combined. This fixes the list example. Reviewed-by: Mike Blumenkrantz Differential Revision: https://phab.enlightenment.org/D9779 --- src/examples/elementary/efl_ui_list_example_1.c | 1 + src/lib/elementary/efl_ui_collection.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c index 81d378b9c9..5cadb29e6b 100644 --- a/src/examples/elementary/efl_ui_list_example_1.c +++ b/src/examples/elementary/efl_ui_list_example_1.c @@ -315,6 +315,7 @@ elm_main(int argc EINA_UNUSED, char **argv) elm_win_resize_object_add(win, wbox); //window show efl_gfx_entity_visible_set(win, EINA_TRUE); + efl_gfx_entity_size_set(win, EINA_SIZE2D(417, 600)); elm_run(); diff --git a/src/lib/elementary/efl_ui_collection.c b/src/lib/elementary/efl_ui_collection.c index a3ad0daf57..2922c4b7cb 100644 --- a/src/lib/elementary/efl_ui_collection.c +++ b/src/lib/elementary/efl_ui_collection.c @@ -300,14 +300,14 @@ _size_accessor_get_at(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, for (i = 0; i < (conf.range.end_id - conf.range.start_id); ++i) { Efl_Gfx_Entity *geom = eina_list_data_get(lst), *parent; - Eina_Size2D size = efl_gfx_hint_size_min_get(geom); + Eina_Size2D size = efl_gfx_hint_size_combined_min_get(geom); parent = efl_ui_item_parent_get(geom); sizes[i].size = size; _fill_depth(geom, &sizes[i].element_depth, &sizes[i].depth_leader); if (i == 0 && !sizes[0].depth_leader && parent) { - result.parent_size = efl_gfx_hint_size_min_get(parent); + result.parent_size = efl_gfx_hint_size_combined_min_get(parent); } lst = eina_list_next(lst); if (!lst)