X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=blobdiff_plain;f=openbox%2Fclient.c;h=efb815e7fb6a6e93ad5eb564a60dd47cda129f1f;hp=fe342f650cec2d804f101dec8a424422575d75ab;hb=ada5de28f71efaa5584709673cc49cdb3b703299;hpb=ac6cd2344f2afda023ac08017e0d2b19b0f66df8

diff --git a/openbox/client.c b/openbox/client.c
index fe342f6..efb815e 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1826,7 +1826,8 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
     /* finally, the user can have requested no decorations, which overrides
        everything (but doesnt give it a border if it doesnt have one) */
     if (self->undecorated)
-        self->decorations = 0;
+        self->decorations &= (config_theme_keepborder ?
+                              OB_FRAME_DECOR_BORDER : 0);
 
     /* if we don't have a titlebar, then we cannot shade! */
     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))