diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-01-09 13:35:09 -0500 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-01-12 12:26:21 -0500 |
commit | 6c9771689962da392a86225d21aa6743a9c11465 (patch) | |
tree | c7708a55be7944966e2d25729a41fbad8e9ad005 | |
parent | 563fc94494d142173f8768223afef8ae2c538ca4 (diff) | |
download | enlightenment-6c9771689962da392a86225d21aa6743a9c11465.tar.gz |
use e_zone_desk_useful_geometry_get() for all client maximize geometry fetching
fix T6414
-rw-r--r-- | src/bin/e_client.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/bin/e_client.c b/src/bin/e_client.c index e66a8fd600..591a8b6758 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -4003,19 +4003,7 @@ e_client_maximize_geometry_get(const E_Client *ec, E_Maximize max, int *mx, int case E_MAXIMIZE_SMART: case E_MAXIMIZE_EXPAND: - if (ec->desk->visible) - e_zone_useful_geometry_get(ec->zone, &zx, &zy, &zw, &zh); - else - { - x1 = ec->zone->x; - yy1 = ec->zone->y; - x2 = ec->zone->x + ec->zone->w; - y2 = ec->zone->y + ec->zone->h; - e_maximize_client_shelf_fill(ec, &x1, &yy1, &x2, &y2, max); - zx = x1, zy = yy1; - zw = x2 - x1; - zh = y2 - yy1; - } + e_zone_desk_useful_geometry_get(ec->zone, ec->desk, &zx, &zy, &zw, &zh); w = zw, h = zh; e_comp_object_frame_xy_unadjust(ec->frame, ec->x, ec->y, &ecx, &ecy); @@ -4071,11 +4059,8 @@ e_client_maximize_geometry_get(const E_Client *ec, E_Maximize max, int *mx, int x2 = ec->zone->x + ec->zone->w; y2 = ec->zone->y + ec->zone->h; - /* walk through all shelves */ - e_maximize_client_shelf_fill(ec, &x1, &yy1, &x2, &y2, max); - - /* walk through all windows */ - e_maximize_client_client_fill(ec, &x1, &yy1, &x2, &y2, max); + e_zone_desk_useful_geometry_get(ec->zone, ec->desk, &zx, &zy, &zw, &zh); + x1 = zx, yy1 = zy, x2 = x1 + zw, y2 = yy1 + zh; w = x2 - x1; h = y2 - yy1; |