[EGIT] [core/efl] master 02/02: ecore-evas-wayland: Fix issue of starting resizing causing size jumps

[Chris Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b5f8966fbed5e758d57a29fb079219f8ed96cd46

commit b5f8966fbed5e758d57a29fb079219f8ed96cd46
Author: Chris Michael <cpmich...@osg.samsung.com>
Date:   Wed Dec 9 12:03:53 2015 -0500

    ecore-evas-wayland: Fix issue of starting resizing causing size jumps
    
    Previously, when we started to resize an efl app, the size would
    "jump" due to framespace being adjusted. This patch fixes that issue
    and resize now works as expected.
    
    @fix
    
    Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
 .../engines/wayland/ecore_evas_wayland_common.c    | 23 +++++++---------------
 1 file changed, 7 insertions(+), 16 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 4b090ef..e5ccd88 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
@@ -167,8 +167,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data 
EINA_UNUSED, int type EINA_
    Ecore_Evas *ee;
    Ecore_Evas_Engine_Wl_Data *wdata;
    Ecore_Wl2_Event_Window_Configure *ev;
-   int nw = 0, nh = 0;
-   int fw = 0, fh = 0;
+   int nw = 0, nh = 0, fy = 0;
    Eina_Bool prev_max, prev_full;
 
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -200,21 +199,13 @@ _ecore_evas_wl_common_cb_window_configure(void *data 
EINA_UNUSED, int type EINA_
 
    /* NB: We receive window configure sizes based on xdg surface
     * window geometry, so we need to subtract framespace here */
-   evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
+   evas_output_framespace_get(ee->evas, NULL, &fy, NULL, NULL);
+   nh = (ev->h - fy);
 
-   if (ECORE_EVAS_PORTRAIT(ee))
-     {
-        nw -= fw;
-        nh -= fh;
-     }
-   else
-     {
-        nw -= fh;
-        nh -= fw;
-     }
-
-   if (ee->prop.fullscreen || (ee->x != ev->x) || (ee->y != ev->y))
-     _ecore_evas_wl_common_move(ee, ev->x, ev->y);
+   /* NB: This block commented out for now. Unsure this is really needed.
+    * Maximize and moving both seem to work fine without this */
+   /* if (ee->prop.fullscreen || (ee->x != ev->x) || (ee->y != ev->y)) */
+   /*   _ecore_evas_wl_common_move(ee, ev->x, ev->y); */
 
    if (ee->prop.fullscreen || (ee->req.w != nw) || (ee->req.h != nh))
      _ecore_evas_wl_common_resize(ee, nw, nh);

--