discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=22aa63c4a346ea66a07ad061f0639c7372bba08a
commit 22aa63c4a346ea66a07ad061f0639c7372bba08a Author: Mike Blumenkrantz <[email protected]> Date: Wed Jun 22 13:00:29 2016 -0400 Revert "do not change E_Client->saved values during maximize if need_maximize is set" This reverts commit 9a9c09f514d02edf7feb6770cefacf0b3f77f2be. a better solution should be found at some point since this is broken in x11 too --- src/bin/e_client.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 9110daa..0255ccb 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -3798,18 +3798,6 @@ e_client_maximize(E_Client *ec, E_Maximize max) ((ec->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)) return; if (ec->new_client) { - 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->changes.need_maximize = 1; ec->maximized &= ~E_MAXIMIZE_TYPE; ec->maximized |= max; @@ -3825,18 +3813,14 @@ e_client_maximize(E_Client *ec, E_Maximize max) if (!(ec->maximized & E_MAXIMIZE_HORIZONTAL)) { /* Horizontal hasn't been set */ - if ((!ec->changes.need_maximize) || (!ec->saved.x)) - ec->saved.x = ec->client.x - ec->zone->x; - if ((!ec->changes.need_maximize) || (!ec->saved.w)) - ec->saved.w = ec->client.w; + 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 */ - if ((!ec->changes.need_maximize) || (!ec->saved.y)) - ec->saved.y = ec->client.y - ec->zone->y; - if ((!ec->changes.need_maximize) || (!ec->saved.h)) - ec->saved.h = ec->client.h; + ec->saved.y = ec->client.y - ec->zone->y; + ec->saved.h = ec->client.h; } ec->saved.zone = ec->zone->num; --
