diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-05-30 08:55:30 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-05-30 08:55:30 +0000 |
| commit | 9ccebf111819c77108c179b906d824cb2a2a790d (patch) | |
| tree | cd14bea31f0cd9ece446fdbb5409ae2b68fe61dc /src/Window.cc | |
| parent | c5c5a80c7e9146e0c53f866c1ddbc2c352f4dcea (diff) | |
redecorating fixups. sync with bb cvs.
Diffstat (limited to 'src/Window.cc')
| -rw-r--r-- | src/Window.cc | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc index 47809ea9..840954ec 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -2698,7 +2698,7 @@ void BlackboxWindow::shapeEvent(XShapeEvent *) { #endif // SHAPE -bool BlackboxWindow::validateClient(void) { +bool BlackboxWindow::validateClient(void) const { XSync(blackbox->getXDisplay(), False); XEvent e; @@ -2802,21 +2802,37 @@ void BlackboxWindow::changeBlackboxHints(BlackboxHints *net) { default: case DecorNormal: - decorations |= Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Iconify | Decor_Maximize; + decorations |= Decor_Titlebar | Decor_Border | Decor_Iconify; + + decorations = ((functions & Func_Resize) && !isTransient() ? + decorations | Decor_Handle : + decorations &= ~Decor_Handle); + decorations = (functions & Func_Maximize ? + decorations | Decor_Maximize : + decorations &= ~Decor_Maximize); break; case DecorTiny: decorations |= Decor_Titlebar | Decor_Iconify; - decorations &= ~(Decor_Border | Decor_Handle | Decor_Maximize); + decorations &= ~(Decor_Border | Decor_Handle); + + decorations = (functions & Func_Maximize ? + decorations | Decor_Maximize : + decorations &= ~Decor_Maximize); break; case DecorTool: decorations |= Decor_Titlebar; - decorations &= ~(Decor_Iconify | Decor_Border | Decor_Handle); - functions |= Func_Move; + decorations &= ~(Decor_Iconify | Decor_Border); + + decorations = ((functions & Func_Resize) && !isTransient() ? + decorations | Decor_Handle : + decorations &= ~Decor_Handle); + decorations = (functions & Func_Maximize ? + decorations | Decor_Maximize : + decorations &= ~Decor_Maximize); break; } |