summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-03-10 15:18:57 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-03-10 15:20:22 +0900
commit6c62ae3e6e1531d76a31aaacebee35f76b0abfa4 (patch)
tree9d7d858e4f789b878684163c095c482b3db04113
parent60566ca34d0036d21e5d134ba299b6f0fa26ce86 (diff)
Revert "Genlist: Calculate the min size of content before item realize"
This reverts commit 60566ca34d0036d21e5d134ba299b6f0fa26ce86. This broke the layout in "Genlist Full Widget"
-rw-r--r--src/lib/elementary/elm_genlist.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index aa049c898f..3197500492 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -412,17 +412,16 @@ _item_content_realize(Elm_Gen_Item *it,
412 // FIXME: cause elm_layout sizing eval is delayed by smart calc, 412 // FIXME: cause elm_layout sizing eval is delayed by smart calc,
413 // genlist cannot get actual min size of edje. 413 // genlist cannot get actual min size of edje.
414 // This is workaround code to set min size directly. 414 // This is workaround code to set min size directly.
415 Evas_Object *resize_obj = NULL; 415 if (efl_class_get(content) == ELM_LAYOUT_CLASS)
416 if (efl_isa(content, ELM_WIDGET_CLASS))
417 { 416 {
418 ELM_WIDGET_DATA_GET_OR_RETURN(content, wd); 417 Evas_Coord old_w, old_h, minw = 0, minh = 0;
419 resize_obj = wd->resize_obj; 418 efl_gfx_size_hint_combined_min_get(content, &old_w, &old_h);
420 } 419 edje_object_size_min_calc(elm_layout_edje_get(content), &minw, &minh);
421 else if (efl_isa(content, EFL_CANVAS_GROUP_CLASS))
422 resize_obj = content;
423 420
424 if (resize_obj && efl_canvas_group_need_recalculate_get(resize_obj)) 421 if (old_w > minw) minw = old_w;
425 efl_canvas_group_calculate(content); 422 if (old_h > minh) minw = old_h;
423 evas_object_size_hint_min_set(content, minw, minh);
424 }
426 425
427 if (!edje_object_part_swallow(target, key, content)) 426 if (!edje_object_part_swallow(target, key, content))
428 { 427 {