summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openbox/frame.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/openbox/frame.c b/openbox/frame.c
index e3cd4240..0256f680 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -295,18 +295,20 @@ void frame_adjust_shape(ObFrame *self)
num = 0;
if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
- xrect[0].x = -ob_rr_theme->fbwidth;
- xrect[0].y = -ob_rr_theme->fbwidth;
- xrect[0].width = self->width + self->bwidth * 2;
+ xrect[0].x = 0;
+ xrect[0].y = 0;
+ xrect[0].width = self->area.width;
xrect[0].height = ob_rr_theme->title_height +
- self->bwidth * 2;
+ self->bwidth + self->rbwidth;
++num;
}
- if (self->decorations & OB_FRAME_DECOR_HANDLE) {
- xrect[1].x = -ob_rr_theme->fbwidth;
+ if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+ ob_rr_theme->handle_height > 0)
+ {
+ xrect[1].x = 0;
xrect[1].y = FRAME_HANDLE_Y(self);
- xrect[1].width = self->width + self->bwidth * 2;
+ xrect[1].width = self->area.width;
xrect[1].height = ob_rr_theme->handle_height +
self->bwidth * 2;
++num;