styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "when maximizing a wayland client with csd, use window geometry" 

This reverts commit 6e5e51c2b8.

not a complete solution, makes client code somewhat unreadable
This commit is contained in:
Mike Blumenkrantz 2015-10-29 14:21:42 -04:00
parent 5469c3b680
commit b9e51e1c0d
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/e_client.c
View File

@ -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;