looks backportable?

On Wed, Mar 20, 2013 at 11:10 AM, Carsten Haitzler - Enlightenment Git <
no-re...@enlightenment.org> wrote:

> raster pushed a commit to branch master.
>
> commit 9649631c49a46745d7fde8e9d2b75911fd6296e1
> Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
> Date:   Wed Mar 20 20:06:32 2013 +0900
>
>     Fix elm box layout problem with max sizes.
> ---
>  ChangeLog         | 5 +++++
>  NEWS              | 3 ++-
>  src/lib/els_box.c | 2 ++
>  3 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index ab39c46..deefb8d 100644
> --- a/ChangeLog
> +++ b/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/NEWS b/NEWS
> index b322f5d..ba19160 100644
> --- a/NEWS
> +++ b/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/src/lib/els_box.c b/src/lib/els_box.c
> index cacf9dd..96cec9c 100644
> --- a/src/lib/els_box.c
> +++ b/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)
>       {
>
> --
>
>
> ------------------------------------------------------------------------------
> Everyone hates slow websites. So do we.
> Make your web apps faster with AppDynamics
> Download AppDynamics Lite for free today:
> http://p.sf.net/sfu/appdyn_d2d_mar
>
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to