{
if (horizontal && extended)
{
- evas_object_geometry_get(box, NULL, NULL, &w, &h);
+ evas_object_geometry_get(box, NULL, NULL, &w, NULL);
+ evas_object_size_hint_min_get(box, &minw, NULL);
}
EINA_LIST_FOREACH(priv->children, l, opt)
{
evas_object_size_hint_min_get(opt->obj, &mnw, &mnh);
- evas_object_size_hint_weight_get(opt->obj, &wx, NULL);
if (horizontal)
{
if (extended)
{
+ evas_object_size_hint_weight_get(opt->obj, &wx, NULL);
+
if(wx)
{
if (mnw != -1 && (w - cw) >= mnw)
if ((cw + mnw) > w)
{
minh += cmaxh;
- if (sumw > minw) minw = sumw;
cw = 0;
cmaxh = 0;
- sumw = 0;
}
cw += ww;
if (cmaxh < mnh) cmaxh = mnh;
-
- sumw += mnw;
}
else
{
if(horizontal && extended)
{
minh += cmaxh;
- if (sumw > minw) minw = sumw;
}
}
if (wy > 0.0) expand++;
}
}
- if (expand == 0)
+ if (expand == 0 && (!extended))
{
evas_object_size_hint_align_get(o, &ax, &ay);
if (horizontal)