remove client maximize states during unmaximize only if they are active
authorMike Blumenkrantz <zmike@osg.samsung.com>
Mon, 28 Sep 2015 18:36:59 +0000 (14:36 -0400)
committerMike Blumenkrantz <zmike@osg.samsung.com>
Mon, 28 Sep 2015 18:36:59 +0000 (14:36 -0400)
do not accidentally remove untested states using bad math operations

src/bin/e_client.c

index 53c91f8..0f91ba9 100644 (file)
@@ -3837,9 +3837,12 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
                   h = ec->saved.h;
                   vert = EINA_TRUE;
                   y = ec->saved.y + ec->zone->y;
-                  ec->maximized &= ~E_MAXIMIZE_VERTICAL;
-                  ec->maximized &= ~E_MAXIMIZE_LEFT;
-                  ec->maximized &= ~E_MAXIMIZE_RIGHT;
+                  if ((max & E_MAXIMIZE_VERTICAL) == E_MAXIMIZE_VERTICAL)
+                    ec->maximized &= ~E_MAXIMIZE_VERTICAL;
+                  if ((max & E_MAXIMIZE_LEFT) == E_MAXIMIZE_LEFT)
+                    ec->maximized &= ~E_MAXIMIZE_LEFT;
+                  if ((max & E_MAXIMIZE_RIGHT) == E_MAXIMIZE_RIGHT)
+                    ec->maximized &= ~E_MAXIMIZE_RIGHT;
                }
              if (max & E_MAXIMIZE_HORIZONTAL)
                {