[EGIT] [core/enlightenment] master 01/01: always use largest available size for free-oriented gadgets

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d1953c2205747ef4bbe9e97fd88d70912b717c38

commit d1953c2205747ef4bbe9e97fd88d70912b717c38
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Sep 19 15:50:55 2016 -0400

    always use largest available size for free-oriented gadgets
    
    ensure that gadgets don't unexpectedly clamp to minimum size
---
 src/bin/e_gadget.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 7b87556..54ef51c 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -373,8 +373,8 @@ _site_gadget_resize(Evas_Object *g, int w, int h, 
Evas_Coord *ww, Evas_Coord *hh
    else
      {
         *ww = mnw, *hh = mnh;
-        if (!(*ww)) *ww = w;
-        if (!(*hh)) *hh = h;
+        if ((!(*ww)) || ((*ww) < w)) *ww = w;
+        if ((!(*hh)) || ((*hh) < h)) *hh = h;
      }
    if (aspect && ax && ay)
      {
@@ -395,7 +395,14 @@ _site_gadget_resize(Evas_Object *g, int w, int h, 
Evas_Coord *ww, Evas_Coord *hh
                {
                   double ar = ax / (double) ay;
 
-                  if (ar > 1.0)
+                  if (ax == ay)
+                    {
+                       if (*ww > *hh)
+                         *hh = *ww;
+                       else
+                         *ww = *hh;
+                    }
+                  else if (ar > 1.0)
                     *hh = (*ww * ay / ax);
                   else
                     *ww = (*hh * ax / ay);

--