diff options
| author | Dustin Mierau <dustin@mierau.me> | 2024-05-15 10:06:19 -0700 |
|---|---|---|
| committer | Dustin Mierau <dustin@mierau.me> | 2024-05-15 10:06:19 -0700 |
| commit | bba5122797f47f463c2949a79876e2514694ca02 (patch) | |
| tree | 9f6fb7a92c441252cf25cd609e5c14bb8869eba2 /Hotline | |
| parent | 6d2fcd6e0f759406c7cbb4f9a0222fd2f839b1a1 (diff) | |
Holding option when clicking server button in banner window now opens a connect to server window.
Diffstat (limited to 'Hotline')
| -rw-r--r-- | Hotline/Application-macOS.swift | 2 | ||||
| -rw-r--r-- | Hotline/Assets.xcassets/Server.imageset/Server.png | bin | 842 -> 846 bytes | |||
| -rw-r--r-- | Hotline/Assets.xcassets/Server.imageset/Server@2x.png | bin | 1778 -> 1777 bytes | |||
| -rw-r--r-- | Hotline/Assets.xcassets/Server.imageset/Server@3x.png | bin | 2813 -> 2827 bytes | |||
| -rw-r--r-- | Hotline/Assets.xcassets/User.imageset/User.png | bin | 433 -> 475 bytes | |||
| -rw-r--r-- | Hotline/Assets.xcassets/User.imageset/User@2x.png | bin | 732 -> 800 bytes | |||
| -rw-r--r-- | Hotline/Assets.xcassets/User.imageset/User@3x.png | bin | 1050 -> 1160 bytes | |||
| -rw-r--r-- | Hotline/Models/ApplicationState.swift | 2 | ||||
| -rw-r--r-- | Hotline/macOS/HotlinePanelView.swift | 8 |
9 files changed, 9 insertions, 3 deletions
diff --git a/Hotline/Application-macOS.swift b/Hotline/Application-macOS.swift index 09d6d91..3ddf903 100644 --- a/Hotline/Application-macOS.swift +++ b/Hotline/Application-macOS.swift @@ -5,7 +5,7 @@ import UniformTypeIdentifiers #if os(macOS) @Observable -class AppLaunchState { +final class AppLaunchState { static let shared = AppLaunchState() enum LaunchState { diff --git a/Hotline/Assets.xcassets/Server.imageset/Server.png b/Hotline/Assets.xcassets/Server.imageset/Server.png Binary files differindex f8d8bcf..9395a0d 100644 --- a/Hotline/Assets.xcassets/Server.imageset/Server.png +++ b/Hotline/Assets.xcassets/Server.imageset/Server.png diff --git a/Hotline/Assets.xcassets/Server.imageset/Server@2x.png b/Hotline/Assets.xcassets/Server.imageset/Server@2x.png Binary files differindex effc0f5..d206fbd 100644 --- a/Hotline/Assets.xcassets/Server.imageset/Server@2x.png +++ b/Hotline/Assets.xcassets/Server.imageset/Server@2x.png diff --git a/Hotline/Assets.xcassets/Server.imageset/Server@3x.png b/Hotline/Assets.xcassets/Server.imageset/Server@3x.png Binary files differindex 5b17b06..6341189 100644 --- a/Hotline/Assets.xcassets/Server.imageset/Server@3x.png +++ b/Hotline/Assets.xcassets/Server.imageset/Server@3x.png diff --git a/Hotline/Assets.xcassets/User.imageset/User.png b/Hotline/Assets.xcassets/User.imageset/User.png Binary files differindex c69a204..0bf463b 100644 --- a/Hotline/Assets.xcassets/User.imageset/User.png +++ b/Hotline/Assets.xcassets/User.imageset/User.png diff --git a/Hotline/Assets.xcassets/User.imageset/User@2x.png b/Hotline/Assets.xcassets/User.imageset/User@2x.png Binary files differindex 03f73e9..27712aa 100644 --- a/Hotline/Assets.xcassets/User.imageset/User@2x.png +++ b/Hotline/Assets.xcassets/User.imageset/User@2x.png diff --git a/Hotline/Assets.xcassets/User.imageset/User@3x.png b/Hotline/Assets.xcassets/User.imageset/User@3x.png Binary files differindex ec35530..aeda6cf 100644 --- a/Hotline/Assets.xcassets/User.imageset/User@3x.png +++ b/Hotline/Assets.xcassets/User.imageset/User@3x.png diff --git a/Hotline/Models/ApplicationState.swift b/Hotline/Models/ApplicationState.swift index 124db6b..5814fba 100644 --- a/Hotline/Models/ApplicationState.swift +++ b/Hotline/Models/ApplicationState.swift @@ -1,7 +1,7 @@ import SwiftUI @Observable -class ApplicationState { +final class ApplicationState { static let shared = ApplicationState() var activeHotline: Hotline? = nil diff --git a/Hotline/macOS/HotlinePanelView.swift b/Hotline/macOS/HotlinePanelView.swift index 69d00aa..9915e49 100644 --- a/Hotline/macOS/HotlinePanelView.swift +++ b/Hotline/macOS/HotlinePanelView.swift @@ -16,7 +16,13 @@ struct HotlinePanelView: View { HStack(spacing: 16) { Button { - openWindow(id: "servers") + if let event = NSApp.currentEvent, + event.modifierFlags.contains(.option) { + openWindow(id: "server") + } + else { + openWindow(id: "servers") + } } label: { Image(systemName: "globe.americas.fill") |
