summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2012-08-16 08:03:20 +0000
committerChristopher Michael <cpmichael1@comcast.net>2012-08-16 08:03:20 +0000
commitbe452d83c998240d8a64fa94de2183eea183f88e (patch)
tree9b8d7bdaa0ec86c61a0797fce388068e820cd636 /legacy/ecore
parentfb2819c4fd24529a1b21d60116173596c99770ba (diff)
Ecore_Evas (wayland): Do not allow windows to be resized below their
desired min/max properties. Fixes ticket #1244 SVN revision: 75308
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c5
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
index 391eab7b5b..0253ded032 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
@@ -1008,6 +1008,11 @@ _ecore_evas_wl_cb_window_configure(void *data __UNUSED__, int type __UNUSED__, v
1008 nh = ev->h - fh; 1008 nh = ev->h - fh;
1009 } 1009 }
1010 1010
1011 if (ee->prop.min.w > nw) nw = ee->prop.min.w;
1012 else if (nw > ee->prop.max.w) nw = ee->prop.max.w;
1013 if (ee->prop.min.h > nh) nh = ee->prop.min.h;
1014 else if (nh > ee->prop.max.h) nh = ee->prop.max.h;
1015
1011 if ((ee->w != nw) || (ee->h != nh)) 1016 if ((ee->w != nw) || (ee->h != nh))
1012 { 1017 {
1013 ee->req.w = nw; 1018 ee->req.w = nw;
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
index 0b3ade4296..8ef3335ddd 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
@@ -1185,6 +1185,11 @@ _ecore_evas_wl_cb_window_configure(void *data __UNUSED__, int type __UNUSED__, v
1185 nh = ev->h - fh; 1185 nh = ev->h - fh;
1186 } 1186 }
1187 1187
1188 if (ee->prop.min.w > nw) nw = ee->prop.min.w;
1189 else if (nw > ee->prop.max.w) nw = ee->prop.max.w;
1190 if (ee->prop.min.h > nh) nh = ee->prop.min.h;
1191 else if (nh > ee->prop.max.h) nh = ee->prop.max.h;
1192
1188 if ((ee->w != nw) || (ee->h != nh)) 1193 if ((ee->w != nw) || (ee->h != nh))
1189 { 1194 {
1190 ee->req.w = nw; 1195 ee->req.w = nw;