Merge branch 'backport' into work

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index c633fa6d1285b729781ba78e8fa1badfd657f33e..ab5a14a868a4761023f52b02bbf3e651645c58d7 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -339,7 +339,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         self->shaded = self->client->shaded;
 
         if (self->decorations & OB_FRAME_DECOR_BORDER ||
-            (self->client->undecorated && config_theme_keepborder))
+            (self->client->undecorated && config_theme_keepborder
+             && !self->client->fullscreen))
             self->bwidth = ob_rr_theme->fbwidth;
         else
             self->bwidth = 0;