diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-11-21 16:56:07 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-11-21 16:56:07 -0500 |
| commit | 4bf6b1b551be744be4fbe4d1faab5be12d051378 (patch) | |
| tree | a17c1404021df31757bc53fe35914182f389c1e1 /openbox/client.c | |
| parent | c02c825cb8f18f0170b312ea8d4b3f4d491bff40 (diff) | |
| parent | ada5de28f71efaa5584709673cc49cdb3b703299 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/popup.c
Diffstat (limited to 'openbox/client.c')
| -rw-r--r-- | openbox/client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/client.c b/openbox/client.c index 060499b0..fc087d44 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1752,7 +1752,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)) |