NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore-evas-wayland: Port fix of min/max size calculations to the 

configure event handler

Summary: This patch ports the fix for windows without a min/max size
being set over to the configure event handler (which was also not
taking into account the fact that Some windows may Not have a min/max
property set on them.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-01-08 09:10:21 -05:00
parent ec1afd74fd
commit 9e485439d7
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -211,25 +211,33 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
if (!ee->prop.fullscreen)
{
int fw = 0, fh = 0;
int maxw, maxh;
int minw, minh;
double a;
int maxw = 0, maxh = 0;
int minw = 0, minh = 0;
double a = 0.0;
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if (ECORE_EVAS_PORTRAIT(ee))
{
minw = (ee->prop.min.w + fw);
minh = (ee->prop.min.h + fh);
maxw = (ee->prop.max.w + fw);
maxh = (ee->prop.max.h + fh);
if (ee->prop.min.w > 0)
minw = (ee->prop.min.w - fw);
if (ee->prop.min.h > 0)
minh = (ee->prop.min.h - fh);
if (ee->prop.max.w > 0)
maxw = (ee->prop.max.w + fw);
if (ee->prop.max.h > 0)
maxh = (ee->prop.max.h + fh);
}
else
{
minw = (ee->prop.min.w + fh);
minh = (ee->prop.min.h + fw);
maxw = (ee->prop.max.w + fh);
maxh = (ee->prop.max.h + fw);
if (ee->prop.min.w > 0)
minw = (ee->prop.min.w - fh);
if (ee->prop.min.h > 0)
minh = (ee->prop.min.h - fw);
if (ee->prop.max.w > 0)
maxw = (ee->prop.max.w + fh);
if (ee->prop.max.h > 0)
maxh = (ee->prop.max.h + fw);
}
/* adjust size using aspect */
@ -293,10 +301,15 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
nh = (minh + (((nh - minh) / ee->prop.step.h) * ee->prop.step.h));
}
if (nw > maxw) nw = maxw;
else if (nw < minw) nw = minw;
if (nh > maxh) nh = maxh;
else if (nh < minh) nh = minh;
if ((maxw > 0) && (nw > maxw))
nw = maxw;
else if (nw < minw)
nw = minw;
if ((maxh > 0) && (nh > maxh))
nh = maxh;
else if (nh < minh)
nh = minh;
orig_w = nw;
orig_h = nh;