Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

titlebar: fix geometry calculations 

Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Maarten Maathuis 2008-12-10 21:40:56 +01:00 committed by Julien Danjou
parent 630ef295a1
commit 49ad26d2d2
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
titlebar.h
View File

@ -43,35 +43,34 @@ int luaA_titlebar_newindex(lua_State *, wibox_t *, awesome_token_t);
static inline area_t static inline area_t
titlebar_geometry_add(wibox_t *t, int border, area_t geometry) titlebar_geometry_add(wibox_t *t, int border, area_t geometry)
{ {
/* We need to add titlebar border to the total width and height.
* This can then be substracted/added to the witdh/height/x/y.
* In this case the border is included, because it belongs to a different window.
*/
if(t) if(t)
switch(t->position) switch(t->position)
{ {
case Top: case Top:
geometry.y -= t->sw.geometry.height + 2 * t->sw.border.width - border; geometry.y -= t->sw.geometry.height + 2 * t->sw.border.width;
geometry.height += t->sw.geometry.height + 2 * t->sw.border.width - border; geometry.height += t->sw.geometry.height + 2 * t->sw.border.width;
geometry.width += 2 * border;
break; break;
case Bottom: case Bottom:
geometry.height += t->sw.geometry.height + 2 * t->sw.border.width - border; geometry.height += t->sw.geometry.height + 2 * t->sw.border.width;
geometry.width += 2 * border;
break; break;
case Left: case Left:
geometry.x -= t->sw.geometry.width + 2 * t->sw.border.width - border; geometry.x -= t->sw.geometry.width + 2 * t->sw.border.width;
geometry.width += t->sw.geometry.width + 2 * t->sw.border.width - border; geometry.width += t->sw.geometry.width + 2 * t->sw.border.width;
geometry.height += 2 * border;
break; break;
case Right: case Right:
geometry.width += t->sw.geometry.width + 2 * t->sw.border.width - border; geometry.width += t->sw.geometry.width + 2 * t->sw.border.width;
geometry.height += 2 * border;
break; break;
default: default:
break; break;
} }
else
{ /* Adding a border to a client only changes width and height, x and y are including border. */
geometry.width += 2 * border; geometry.width += 2 * border;
geometry.height += 2 * border; geometry.height += 2 * border;
}
return geometry; return geometry;
} }
@ -85,35 +84,34 @@ titlebar_geometry_add(wibox_t *t, int border, area_t geometry)
static inline area_t static inline area_t
titlebar_geometry_remove(wibox_t *t, int border, area_t geometry) titlebar_geometry_remove(wibox_t *t, int border, area_t geometry)
{ {
/* We need to add titlebar border to the total width and height.
* This can then be substracted/added to the witdh/height/x/y.
* In this case the border is included, because it belongs to a different window.
*/
if(t) if(t)
switch(t->position) switch(t->position)
{ {
case Top: case Top:
geometry.y += t->sw.geometry.height + 2 * t->sw.border.width - border; geometry.y += t->sw.geometry.height + 2 * t->sw.border.width;
geometry.height -= t->sw.geometry.height + 2 * t->sw.border.width - border; geometry.height -= t->sw.geometry.height + 2 * t->sw.border.width;
geometry.width -= 2 * border;
break; break;
case Bottom: case Bottom:
geometry.height -= t->sw.geometry.height + 2 * t->sw.border.width - border; geometry.height -= t->sw.geometry.height + 2 * t->sw.border.width;
geometry.width -= 2 * border;
break; break;
case Left: case Left:
geometry.x += t->sw.geometry.width + 2 * t->sw.border.width - border; geometry.x += t->sw.geometry.width + 2 * t->sw.border.width;
geometry.width -= t->sw.geometry.width + 2 * t->sw.border.width - border; geometry.width -= t->sw.geometry.width + 2 * t->sw.border.width;
geometry.height -= 2 * border;
break; break;
case Right: case Right:
geometry.width -= t->sw.geometry.width + 2 * t->sw.border.width - border; geometry.width -= t->sw.geometry.width + 2 * t->sw.border.width;
geometry.height -= 2 * border;
break; break;
default: default:
break; break;
} }
else
{ /* Adding a border to a client only changes width and height, x and y are including border. */
geometry.width -= 2 * border; geometry.width -= 2 * border;
geometry.height -= 2 * border; geometry.height -= 2 * border;
}
return geometry; return geometry;
} }