[titlebar] Collapse titlebar to windows even if we do not resize it

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-03-26 11:03:52 +01:00
parent 3ea69238ae
commit 15256cccc1
1 changed files with 11 additions and 8 deletions

View File

@ -499,6 +499,7 @@ client_resize(Client *c, area_t geometry, Bool hints)
area_t area; area_t area;
XWindowChanges wc; XWindowChanges wc;
Layout *layout = layout_get_current(c->screen); Layout *layout = layout_get_current(c->screen);
Bool resized = False;
if(!c->ismoving && !c->isfloating && layout->arrange != layout_floating) if(!c->ismoving && !c->isfloating && layout->arrange != layout_floating)
{ {
@ -546,12 +547,6 @@ client_resize(Client *c, area_t geometry, Bool hints)
c->f_geometry = geometry; c->f_geometry = geometry;
titlebar_update_geometry_floating(c); titlebar_update_geometry_floating(c);
} }
/* call it again like it was floating,
* because for right or bottom titlebar,
* we want it to be sticked to the window */
else if(!c->ismoving && !c->isfloating && layout->arrange != layout_floating
&& (c->titlebar.position == Right || c->titlebar.position == Bottom))
titlebar_update_geometry_floating(c);
XConfigureWindow(globalconf.display, c->win, XConfigureWindow(globalconf.display, c->win,
CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
@ -560,9 +555,17 @@ client_resize(Client *c, area_t geometry, Bool hints)
if(c->screen != new_screen) if(c->screen != new_screen)
move_client_to_screen(c, new_screen, False); move_client_to_screen(c, new_screen, False);
return True; resized = True;
} }
return False;
/* call it again like it was floating,
* because for right or bottom titlebar,
* we want it to be sticked to the window */
if(!c->ismoving && !c->isfloating && layout->arrange != layout_floating
&& (c->titlebar.position == Right || c->titlebar.position == Bottom))
titlebar_update_geometry_floating(c);
return resized;
} }
void void