[EGIT] [core/enlightenment] master 01/02: Revert "when maximizing a wayland client with csd, use window geometry"

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit b9e51e1c0dfb4176afc919d06a4d651a0944632a
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Oct 29 14:21:42 2015 -0400

    Revert "when maximizing a wayland client with csd, use window geometry"
    
    This reverts commit 6e5e51c2b8647a41f156e2854be409780492a679.
    
    not a complete solution, makes client code somewhat unreadable
---
 src/bin/e_client.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index abd5c89..142a767 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -1606,13 +1606,8 @@ _e_client_maximize(E_Client *ec, E_Maximize max)
 
         evas_object_smart_callback_call(ec->frame, "maximize", NULL);
         e_client_resize_limit(ec, &w, &h);
-        if (e_comp_object_frame_allowed(ec->frame))
-          {
-             e_comp_object_frame_xy_unadjust(ec->frame, ec->x, ec->y, &ecx, 
&ecy);
-             e_comp_object_frame_wh_unadjust(ec->frame, ec->w, ec->h, &ecw, 
&ech);
-          }
-        else
-          ecx = ec->x, ecy = ec->y, ecw = ec->w, ech = ec->h;
+        e_comp_object_frame_xy_unadjust(ec->frame, ec->x, ec->y, &ecx, &ecy);
+        e_comp_object_frame_wh_unadjust(ec->frame, ec->w, ec->h, &ecw, &ech);
 
         if (ecw < zw)
           w = ecw;
@@ -3750,19 +3745,13 @@ e_client_maximize(E_Client *ec, E_Maximize max)
      {
         /* Horizontal hasn't been set */
         ec->saved.x = ec->client.x - ec->zone->x;
-        if ((!e_comp_object_frame_allowed(ec->frame)) && 
(!e_pixmap_is_x(ec->pixmap)))
-          ec->saved.w = ec->w;
-        else
-          ec->saved.w = ec->client.w;
+        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;
-        if ((!e_comp_object_frame_allowed(ec->frame)) && 
(!e_pixmap_is_x(ec->pixmap)))
-          ec->saved.h = ec->h;
-        else
-          ec->saved.h = ec->client.h;
+        ec->saved.h = ec->client.h;
      }
 
    ec->saved.zone = ec->zone->num;

--