revert my commit of d3th, it fucked up focus badly

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index cbb6dfda7d19d08693aac325933c47988166b88a..327507f2e56ceefadc054e2ed5a1d54992147801 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -183,7 +183,6 @@ void frame_adjust_theme(ObFrame *self)
 {
     free_theme_statics(self);
     set_theme_statics(self);
-    frame_adjust_area(self, TRUE, TRUE, FALSE);
 }
 
 void frame_adjust_shape(ObFrame *self)
@@ -271,7 +270,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->innersize.top += ob_rr_theme->title_height + self->rbwidth +
                 (self->rbwidth - self->bwidth);
-        if (self->decorations & OB_FRAME_DECOR_HANDLE)
+        if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+            ob_rr_theme->show_handle)
             self->innersize.bottom += ob_rr_theme->handle_height +
                 self->rbwidth + (self->rbwidth - self->bwidth);
   
@@ -312,7 +312,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             layout_title(self);
 
         if (!fake) {
-            if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+            if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+                ob_rr_theme->show_handle)
+            {
                 XMoveResizeWindow(ob_display, self->handle,
                                   -self->bwidth, FRAME_HANDLE_Y(self),
                                   self->width, ob_rr_theme->handle_height);