Skip to content

Added default hotkey for settings window. #218

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

Open
Muuulya wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added default hotkey for settings window. #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions LaunchNext/LaunchpadApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,19 @@ class BorderlessWindow: NSWindow {
@main
struct LaunchpadApp: App {
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
var body: some Scene { Settings {} }
var body: some Scene {
Settings{
EmptyView()
}
.commands {
CommandGroup(replacing: .appSettings) {
Button("Settings") {
AppDelegate.shared?.openSettings()
}
.keyboardShortcut(",", modifiers: .command)
}
}
}
}

class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate, NSGestureRecognizerDelegate {
Expand Down Expand Up @@ -74,7 +86,19 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate, NSGestureR

if appStore.isFullscreenMode { updateWindowMode(isFullscreen: true) }
}


private var isLaunchpadWindowVisibleNow: Bool {
guard windowIsVisible, !isAnimatingWindow, let w = window else { return false }
if !w.isVisible { return false }
if !w.occlusionState.contains(.visible) { return false }
return true
}

func openSettings() {
guard isLaunchpadWindowVisibleNow else { return }
self.appStore.isSetting = true
}

// MARK: - Global Hotkey

func updateGlobalHotKey(configuration: AppStore.HotKeyConfiguration?) {
Expand Down