From 2b196bcc549c5c155e035ab2398edf799e812a93 Mon Sep 17 00:00:00 2001 From: Viktor Kojouharov Date: Mon, 2 Mar 2009 13:47:50 +0000 Subject: [PATCH] --oopsie in the min size calc of the flow layouts SVN revision: 39330 --- legacy/evas/src/lib/canvas/evas_object_box.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/legacy/evas/src/lib/canvas/evas_object_box.c index c31a32fa68..91c86d56e0 100644 --- a/legacy/evas/src/lib/canvas/evas_object_box.c +++ b/legacy/evas/src/lib/canvas/evas_object_box.c @@ -1573,7 +1573,8 @@ evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *pri } evas_object_geometry_get(o, &x, NULL, NULL, NULL); - min_w = row_width[r]; + if (min_w < row_width[r]) + min_w = row_width[r]; min_h += row_max_h[r]; y += row_max_h[r] + inc_y; } @@ -1753,7 +1754,8 @@ evas_object_box_layout_flow_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, evas_object_geometry_get(o, NULL, &y, NULL, NULL); min_w += col_max_w[c]; - min_h = col_height[c]; + if (min_h < col_height[c]) + min_h = col_height[c]; x += col_max_w[c] + inc_x; }