raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=02da386da89e06f6ab7335111848fb94bd358053
commit 02da386da89e06f6ab7335111848fb94bd358053 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri Apr 17 12:08:27 2020 +0100 ecore evas - wl - fix useless iff case for rotation rotationis handled later on in the func thsi fixes CID 1419870 --- .../engines/wayland/ecore_evas_wayland_common.c | 38 +++++----------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 67a59709bd..b0a5d59963 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -364,38 +364,16 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h) int maxw = 0, maxh = 0; int minw = 0, minh = 0; - if (ECORE_EVAS_PORTRAIT(ee)) - { - if (ee->prop.min.w > 0) - minw = (ee->prop.min.w); - if (ee->prop.min.h > 0) - minh = (ee->prop.min.h); - if (ee->prop.max.w > 0) - maxw = (ee->prop.max.w); - if (ee->prop.max.h > 0) - maxh = (ee->prop.max.h); - } - else - { - if (ee->prop.min.w > 0) - minw = (ee->prop.min.w); - if (ee->prop.min.h > 0) - minh = (ee->prop.min.h); - if (ee->prop.max.w > 0) - maxw = (ee->prop.max.w); - if (ee->prop.max.h > 0) - maxh = (ee->prop.max.h); - } + if (ee->prop.min.w > 0) minw = (ee->prop.min.w); + if (ee->prop.min.h > 0) minh = (ee->prop.min.h); + if (ee->prop.max.w > 0) maxw = (ee->prop.max.w); + if (ee->prop.max.h > 0) maxh = (ee->prop.max.h); - if ((maxw > 0) && (w > maxw)) - w = maxw; - else if (w < minw) - w = minw; + if ((maxw > 0) && (w > maxw)) w = maxw; + else if (w < minw) w = minw; - if ((maxh > 0) && (h > maxh)) - h = maxh; - else if (h < minh) - h = minh; + if ((maxh > 0) && (h > maxh)) h = maxh; + else if (h < minh) h = minh; if (!ee->prop.maximized) { --
