enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

box layout should not silently fail when size is less than min size hint 

this broke box display in any case where the user had manually changed size hints, eg. when using box align

@fix
This commit is contained in:
Mike Blumenkrantz 2014-12-31 15:30:57 -05:00
parent 2dd05e1580
commit 8265a01c2a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/elementary/src/lib/els_box.c
View File

@ -137,7 +137,17 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal
evas_object_geometry_get(o, &x, &y, &w, &h);
evas_object_size_hint_min_get(o, &minw, &minh);
if ((w < minw) || (h < minh)) return;
evas_object_box_align_get(o, &ax, &ay);
if (w < minw)
{
x = x + ((w - minw) * (1.0 - ax));
w = minw;
}
if (h < minh)
{
y = y + ((h - minh) * (1.0 - ay));
h = minh;
}
count = eina_list_count(priv->children);
/* accummulate expand as same way but after switched x and y for horizontal mode */
@ -152,7 +162,6 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal
}
if (!expand)
{
evas_object_box_align_get(o, &ax, &ay);
if (rtl) ax = 1.0 - ax;
if (horizontal)
{