[EGIT] [core/enlightenment] master 01/01: Revert "do not update client saved states during maximize if client is animating"

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6df8f5a806c2e550ccdc7bd8e0b0dadd890e6ecc

commit 6df8f5a806c2e550ccdc7bd8e0b0dadd890e6ecc
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Apr 8 17:23:06 2016 -0400

    Revert "do not update client saved states during maximize if client is 
animating"
    
    This reverts commit 227776985e8aa2f5d802fa0ce1c0f0cc16c6086c.
    
    impossible case, too much wayland
---
 src/bin/e_client.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 101791f..513cbe7 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3787,23 +3787,20 @@ e_client_maximize(E_Client *ec, E_Maximize max)
    if (ec->fullscreen)
      e_client_unfullscreen(ec);
    ec->pre_res_change.valid = 0;
-   if (!ec->maximize_override)
+   if (!(ec->maximized & E_MAXIMIZE_HORIZONTAL))
      {
-        if (!(ec->maximized & E_MAXIMIZE_HORIZONTAL))
-          {
-             /* Horizontal hasn't been set */
-             ec->saved.x = ec->client.x - ec->zone->x;
-             ec->saved.w = ec->client.w;
-          }
-        if (!(ec->maximized & E_MAXIMIZE_VERTICAL))
-          {
-             /* Vertical hasn't been set */
-             ec->saved.y = ec->client.y - ec->zone->y;
-             ec->saved.h = ec->client.h;
-          }
-
-        ec->saved.zone = ec->zone->num;
+        /* Horizontal hasn't been set */
+        ec->saved.x = ec->client.x - ec->zone->x;
+        ec->saved.w = ec->client.w;
      }
+   if (!(ec->maximized & E_MAXIMIZE_VERTICAL))
+     {
+        /* Vertical hasn't been set */
+        ec->saved.y = ec->client.y - ec->zone->y;
+        ec->saved.h = ec->client.h;
+     }
+
+   ec->saved.zone = ec->zone->num;
 
    ec->maximize_override = 1;
    if ((max & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN)

--