summaryrefslogtreecommitdiff
path: root/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-04-17 12:08:27 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-04-17 12:08:27 +0100
commit02da386da89e06f6ab7335111848fb94bd358053 (patch)
treeb896d5f5dbbc54d2f99d64709911e592479706f9 /src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
parent699fadd514a518074aca6d18dc1c4a91644142bf (diff)
ecore evas - wl - fix useless iff case for rotation
rotationis handled later on in the func thsi fixes CID 1419870
Diffstat (limited to '')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c38
1 files 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)
364 int maxw = 0, maxh = 0; 364 int maxw = 0, maxh = 0;
365 int minw = 0, minh = 0; 365 int minw = 0, minh = 0;
366 366
367 if (ECORE_EVAS_PORTRAIT(ee)) 367 if (ee->prop.min.w > 0) minw = (ee->prop.min.w);
368 { 368 if (ee->prop.min.h > 0) minh = (ee->prop.min.h);
369 if (ee->prop.min.w > 0) 369 if (ee->prop.max.w > 0) maxw = (ee->prop.max.w);
370 minw = (ee->prop.min.w); 370 if (ee->prop.max.h > 0) maxh = (ee->prop.max.h);
371 if (ee->prop.min.h > 0)
372 minh = (ee->prop.min.h);
373 if (ee->prop.max.w > 0)
374 maxw = (ee->prop.max.w);
375 if (ee->prop.max.h > 0)
376 maxh = (ee->prop.max.h);
377 }
378 else
379 {
380 if (ee->prop.min.w > 0)
381 minw = (ee->prop.min.w);
382 if (ee->prop.min.h > 0)
383 minh = (ee->prop.min.h);
384 if (ee->prop.max.w > 0)
385 maxw = (ee->prop.max.w);
386 if (ee->prop.max.h > 0)
387 maxh = (ee->prop.max.h);
388 }
389 371
390 if ((maxw > 0) && (w > maxw)) 372 if ((maxw > 0) && (w > maxw)) w = maxw;
391 w = maxw; 373 else if (w < minw) w = minw;
392 else if (w < minw)
393 w = minw;
394 374
395 if ((maxh > 0) && (h > maxh)) 375 if ((maxh > 0) && (h > maxh)) h = maxh;
396 h = maxh; 376 else if (h < minh) h = minh;
397 else if (h < minh)
398 h = minh;
399 377
400 if (!ee->prop.maximized) 378 if (!ee->prop.maximized)
401 { 379 {