dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Genlist: Calculate the min size of content before item realize" 

This reverts commit 60566ca34d.

This broke the layout in "Genlist Full Widget"
This commit is contained in:
Jean-Philippe Andre 2017-03-10 15:18:57 +09:00
parent 60566ca34d
commit 6c62ae3e6e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/elementary/elm_genlist.c
View File

@ -412,17 +412,16 @@ _item_content_realize(Elm_Gen_Item *it,
// FIXME: cause elm_layout sizing eval is delayed by smart calc, // FIXME: cause elm_layout sizing eval is delayed by smart calc,
// genlist cannot get actual min size of edje. // genlist cannot get actual min size of edje.
// This is workaround code to set min size directly. // This is workaround code to set min size directly.
Evas_Object *resize_obj = NULL; if (efl_class_get(content) == ELM_LAYOUT_CLASS)
if (efl_isa(content, ELM_WIDGET_CLASS))
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(content, wd); Evas_Coord old_w, old_h, minw = 0, minh = 0;
resize_obj = wd->resize_obj; efl_gfx_size_hint_combined_min_get(content, &old_w, &old_h);
} edje_object_size_min_calc(elm_layout_edje_get(content), &minw, &minh);
else if (efl_isa(content, EFL_CANVAS_GROUP_CLASS))
resize_obj = content;
if (resize_obj && efl_canvas_group_need_recalculate_get(resize_obj)) if (old_w > minw) minw = old_w;
efl_canvas_group_calculate(content); if (old_h > minh) minw = old_h;
evas_object_size_hint_min_set(content, minw, minh);
}
if (!edje_object_part_swallow(target, key, content)) if (!edje_object_part_swallow(target, key, content))
{ {