summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-20 06:47:43 +0000
committerDana Jansens <danakj@orodu.net>2007-05-20 06:47:43 +0000
commit1612a16e80abb7994d9498de48fe4c0ded00cdb9 (patch)
tree74d8f1765bc60262274c8faa661552ce49d9e78d /openbox
parent1b7c2dac9ed1f77e1b89c8c99e605a5c7d986f2c (diff)
frame can handle having no border between the titlebar and the client now
Diffstat (limited to 'openbox')
-rw-r--r--openbox/frame.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/openbox/frame.c b/openbox/frame.c
index 423ff802..73d5c026 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -190,8 +190,6 @@ ObFrame *frame_new(ObClient *client)
static void set_theme_statics(ObFrame *self)
{
- gint handle_height;
-
/* set colors/appearance/sizes for stuff that doesn't change */
XResizeWindow(ob_display, self->max,
ob_rr_theme->button_size, ob_rr_theme->button_size);
@@ -354,12 +352,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
self->cbwidth_y + self->bwidth);
if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
- self->size.top += ob_rr_theme->title_height + self->bwidth +
- (self->bwidth - self->bwidth);
+ self->size.top += ob_rr_theme->title_height + self->rbwidth;
if (self->decorations & OB_FRAME_DECOR_HANDLE &&
ob_rr_theme->handle_height > 0)
- self->size.bottom += ob_rr_theme->handle_height +
- self->bwidth + (self->bwidth - self->bwidth);
+ {
+ self->size.bottom += ob_rr_theme->handle_height + self->bwidth;
+ }
/* position/size and map/unmap all the windows */
@@ -399,7 +397,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
XMapWindow(ob_display, self->titleleft);
XMapWindow(ob_display, self->titleright);
- if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
+ if (self->decorations & OB_FRAME_DECOR_TITLEBAR &&
+ self->rbwidth)
+ {
XMoveResizeWindow(ob_display, self->titlebottom,
self->bwidth,
ob_rr_theme->title_height + self->bwidth,