From 60f5b43debcb2c7e71afe150da68d8889fe86fe5 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 30 Oct 2015 15:12:41 -0400 Subject: [PATCH] ecore-evas-wl: Ignore step size when maximizing Summary; This fixes an issue where maximizing efl/elm apps in Weston and in Enlightenment would cause extra space to be left around the window. @fix Signed-off-by: Chris Michael --- .../wayland/ecore_evas_wayland_common.c | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 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 2da6c1b09e..634343b158 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 @@ -554,25 +554,28 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h) w = h * ee->prop.aspect; } - /* calc new size using base size & step size */ - if (ee->prop.step.w > 0) + if (!ee->prop.maximized) { - if (ee->prop.base.w >= 0) - w = (ee->prop.base.w + - (((w - ee->prop.base.w) / ee->prop.step.w) * - ee->prop.step.w)); - else - w = (minw + (((w - minw) / ee->prop.step.w) * ee->prop.step.w)); - } + /* calc new size using base size & step size */ + if (ee->prop.step.w > 0) + { + if (ee->prop.base.w >= 0) + w = (ee->prop.base.w + + (((w - ee->prop.base.w) / ee->prop.step.w) * + ee->prop.step.w)); + else + w = (minw + (((w - minw) / ee->prop.step.w) * ee->prop.step.w)); + } - if (ee->prop.step.h > 0) - { - if (ee->prop.base.h >= 0) - h = (ee->prop.base.h + - (((h - ee->prop.base.h) / ee->prop.step.h) * - ee->prop.step.h)); - else - h = (minh + (((h - minh) / ee->prop.step.h) * ee->prop.step.h)); + if (ee->prop.step.h > 0) + { + if (ee->prop.base.h >= 0) + h = (ee->prop.base.h + + (((h - ee->prop.base.h) / ee->prop.step.h) * + ee->prop.step.h)); + else + h = (minh + (((h - minh) / ee->prop.step.h) * ee->prop.step.h)); + } } if ((maxw > 0) && (w > maxw))