Skip to content

gui: Fix keyboard shortcuts for closing windows #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
russellhancox merged 5 commits into from
May 11, 2026
Merged

gui: Fix keyboard shortcuts for closing windows #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8deac2
gui: Fix keyboard shortcuts for closing windows
russellhancox May 8, 2026
c23688a
Lint
russellhancox May 9, 2026
5e2f529
Fix macOS 14 build
russellhancox May 9, 2026
9883fd1
Simplify, remove NSWindow subclass
russellhancox May 9, 2026
37e1200
Merge branch 'main' into rah/gui-fix-cmd-esc
russellhancox May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/gui/SNTBinaryMessageWindowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ struct MoreDetailsView: View {
}
}
.buttonStyle(ScalingButtonStyle())
.keyboardShortcut(.escape, modifiers: .command)
.help("⌘ Esc")
.keyboardShortcut(.cancelAction)
.help("Esc")
}

Spacer()
Expand Down
4 changes: 2 additions & 2 deletions Source/gui/SNTFileAccessMessageWindowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ struct MoreDetailsView: View {
}
}
.buttonStyle(ScalingButtonStyle())
.keyboardShortcut(.escape, modifiers: .command)
.help("⌘ Esc")
.keyboardShortcut(.cancelAction)
.help("Esc")
}

Spacer()
Expand Down
4 changes: 2 additions & 2 deletions Source/gui/SNTMessageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ public func DismissButton(
Text(t).frame(maxWidth: 200.0)
}
)
.keyboardShortcut(.escape, modifiers: .command)
.help("⌘ Esc")
.keyboardShortcut("w", modifiers: .command)
.help("⌘ W")
}

// TextWithLimit is like Text() but it supports a limit on the number of characters in the
Expand Down
4 changes: 2 additions & 2 deletions Source/gui/SNTNetworkMountMessageWindowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ struct MoreDetailsView: View {
}
}
.buttonStyle(ScalingButtonStyle())
.keyboardShortcut(.escape, modifiers: .command)
.help("⌘ Esc")
.keyboardShortcut(.cancelAction)
.help("Esc")
}

Spacer()
Expand Down
6 changes: 5 additions & 1 deletion Source/gui/SNTTestGUI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,17 @@ struct BinaryView: View {
case .Nov25: Date.overrideDate = Date(timeIntervalSince1970: 1732544115)
}

// Mirror SNTExecutionController.mm: customURL falls back to the EventDetailURL
// config so the Open Event button appears in the harness.
let effectiveURL = customURL.isEmpty ? eventDetailURL : customURL

let window = NSWindow()
ShowWindow(
SNTBinaryMessageWindowViewFactory.createWith(
window: window,
event: event,
customMsg: customMsg as NSString?,
customURL: customURL as NSString?,
customURL: effectiveURL.isEmpty ? nil : (effectiveURL as NSString),
configState: SNTConfigState(config: SNTConfigurator.configurator()),
bundleProgress: SNTBundleProgress(),
uiStateCallback: { interval in print("Silence interval was set to \(interval)") },
Expand Down
Loading