From 25721fa0621c0a82c05481b23c95a8b92c28ac62 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 20 Mar 2013 20:06:32 +0900 Subject: [PATCH] Fix elm box layout problem with max sizes. --- legacy/elementary/ChangeLog | 5 +++++ legacy/elementary/NEWS | 3 ++- legacy/elementary/src/lib/els_box.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index ab39c465dd..deefb8d5f5 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1167,3 +1167,8 @@ * Fix the elm_shutdown bug in _elm_shutdown_config. When the elm_shutdown is used after elm_config_all_flush, the segment fault occur. It's why it uses ecore_x in _prop_all_update_cb after removing it. + +2013-03-20 Carsten Haitzler (The Rasterman) + + * Fix elm box layout when an item has a max size, and that squashes all + content even when the minimum size is greater. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index b322f5d62c..ba1916067d 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -187,7 +187,8 @@ Fixes: * Fix a memory leak of elm_genlist - EINA_LIST_FREE should be used for returned value of elm_genlist_realized_items_get * Focus highlight should be reconfigured when theme is changed. * Fix the elm_shutdown bug in _elm_shutdown_config. - + * Fix box layout bug when items with max size force sizes below minimum. + Removals: * All internal widget hooks (and related macros) were removed, due diff --git a/legacy/elementary/src/lib/els_box.c b/legacy/elementary/src/lib/els_box.c index cacf9dd4b9..96cec9cd8b 100644 --- a/legacy/elementary/src/lib/els_box.c +++ b/legacy/elementary/src/lib/els_box.c @@ -98,6 +98,8 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horiz } } } + if ((maxw >= 0) && (minw > maxw)) maxw = minw; + if ((maxh >= 0) && (minh > maxh)) maxh = minh; c = eina_list_count(priv->children) - 1; if (c > 0) {