enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

always use largest available size for free-oriented gadgets 

ensure that gadgets don't unexpectedly clamp to minimum size
This commit is contained in:
Mike Blumenkrantz 2016-09-19 15:50:55 -04:00
parent 9439228816
commit d1953c2205
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_gadget.c
View File

@ -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);