From aea4fd5020e79932663d659e45f384367a5bf126 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Thu, 15 Apr 2021 18:12:14 -0700 Subject: [PATCH] macos: ensure window is always miniaturizable We need to keep the miniaturizable flag in even when there is no titlebar, otherwise the miniaturize action has no effect. --- docs/changelog.md | 1 + window/src/os/macos/window.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 23d2a3ffd..7882e0d62 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -29,6 +29,7 @@ As features stabilize some brief notes about them will accumulate here. * Improved: [font_rules](config/lua/config/font_rules.md) behavior to always append reasonable default `font_rules` to those that you may have specified in your config. `font_rules` now also include defaults for half-bright text styles. * Improved: fallback fonts are scaled according to relative their *cap-height* metric to improve size consistency. This partially applies to some symbol/emoji fonts, but is dependent upon the font having reliable metrics. * Improved: font-config queries now run much faster, resulting in snappier startup on unix systems +* Fixed: [Hide](config/lua/keyassignment/Hide.md) had no effect on macOS when the titlebar was disabled [#679](https://github.com/wez/wezterm/issues/679) ### 20210405-110924-a5bb5be8 diff --git a/window/src/os/macos/window.rs b/window/src/os/macos/window.rs index 883ceb716..8d2f9385b 100644 --- a/window/src/os/macos/window.rs +++ b/window/src/os/macos/window.rs @@ -895,9 +895,9 @@ fn decoration_to_mask(decorations: WindowDecorations) -> NSWindowStyleMask { | NSWindowStyleMask::NSMiniaturizableWindowMask | NSWindowStyleMask::NSResizableWindowMask } else if decorations == WindowDecorations::RESIZE { - NSWindowStyleMask::NSResizableWindowMask + NSWindowStyleMask::NSResizableWindowMask | NSWindowStyleMask::NSMiniaturizableWindowMask } else if decorations == WindowDecorations::NONE { - NSWindowStyleMask::NSBorderlessWindowMask + NSWindowStyleMask::NSBorderlessWindowMask | NSWindowStyleMask::NSMiniaturizableWindowMask } else if decorations == WindowDecorations::TITLE { NSWindowStyleMask::NSTitledWindowMask | NSWindowStyleMask::NSClosableWindowMask