godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bacardi55

Browse Source
This commit is contained in:
Raphael Khaiat 2010-08-03 08:20:13 +02:00
commit ed390279f5
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client.c
View File

@ -828,11 +828,10 @@ client_moveresize(Client *c, XRectangle geo, Bool r)
c->flags &= ~FLayFlag;
}
c->geo = c->ogeo = geo;
c->geo = geo;
if(c->flags & FreeFlag || tags[c->screen][c->tag].layout.func == freelayout
|| conf.keep_layout_geo)
c->free_geo = geo;
if(c->flags & FreeFlag || !(c->flags & (TileFlag | LMaxFlag)) || conf.keep_layout_geo)
c->free_geo = c->geo;
if((c->screen = screen_get_with_geo(c->geo.x, c->geo.y)) != os
&& c->tag != MAXTAG + 1)
@ -854,19 +853,17 @@ client_moveresize(Client *c, XRectangle geo, Bool r)
void
client_maximize(Client *c)
{
XRectangle geo;
if(!c || c->flags & FSSFlag)
return;
c->screen = screen_get_with_geo(c->geo.x, c->geo.y);
geo.x = sgeo[c->screen].x;
geo.y = sgeo[c->screen].y;
geo.width = sgeo[c->screen].width - BORDH * 2;
geo.height = sgeo[c->screen].height - BORDH;
c->geo.x = sgeo[c->screen].x;
c->geo.y = sgeo[c->screen].y;
c->geo.width = sgeo[c->screen].width - BORDH * 2;
c->geo.height = sgeo[c->screen].height - BORDH;
client_moveresize(c, geo, False);
client_moveresize(c, c->geo, False);
return;
}

2
src/layout.c
View File

@ -846,7 +846,7 @@ uicb_togglemax(uicb_t cmd)
}
else
{
sel->geo = sel->free_geo;
sel->geo = sel->ogeo;
client_moveresize(sel, sel->geo, True);
sel->flags &= ~MaxFlag;
tags[selscreen][seltag[selscreen]].layout.func(selscreen);