Do not use titlebar_update_geometry_floating() which sucks in client_resize()

This commit is contained in:
Julien Danjou 2008-03-16 11:06:08 +01:00
parent e22d57a0ca
commit 3eef1842e4
1 changed files with 7 additions and 3 deletions

View File

@ -546,9 +546,9 @@ client_resize(Client *c, area_t geometry, Bool hints)
return False; return False;
/* offscreen appearance fixes */ /* offscreen appearance fixes */
area = get_display_area(get_phys_screen(c->screen), area = get_display_area(get_phys_screen(c->screen), NULL,
NULL,
&globalconf.screens[c->screen].padding); &globalconf.screens[c->screen].padding);
if(geometry.x > area.width) if(geometry.x > area.width)
geometry.x = area.width - geometry.width - 2 * c->border; geometry.x = area.width - geometry.width - 2 * c->border;
if(geometry.y > area.height) if(geometry.y > area.height)
@ -577,7 +577,11 @@ client_resize(Client *c, area_t geometry, Bool hints)
{ {
if(!c->ismax) if(!c->ismax)
c->f_geometry = geometry; c->f_geometry = geometry;
titlebar_update_geometry_floating(c); geometry = titlebar_update_geometry(c, geometry);
wc.x = geometry.x;
wc.y = geometry.y;
wc.width = geometry.width;
wc.height = geometry.height;
} }
XConfigureWindow(globalconf.display, c->win, XConfigureWindow(globalconf.display, c->win,