From bba5122797f47f463c2949a79876e2514694ca02 Mon Sep 17 00:00:00 2001 From: Dustin Mierau Date: Wed, 15 May 2024 10:06:19 -0700 Subject: Holding option when clicking server button in banner window now opens a connect to server window. --- Hotline/Application-macOS.swift | 2 +- Hotline/Assets.xcassets/Server.imageset/Server.png | Bin 842 -> 846 bytes Hotline/Assets.xcassets/Server.imageset/Server@2x.png | Bin 1778 -> 1777 bytes Hotline/Assets.xcassets/Server.imageset/Server@3x.png | Bin 2813 -> 2827 bytes Hotline/Assets.xcassets/User.imageset/User.png | Bin 433 -> 475 bytes Hotline/Assets.xcassets/User.imageset/User@2x.png | Bin 732 -> 800 bytes Hotline/Assets.xcassets/User.imageset/User@3x.png | Bin 1050 -> 1160 bytes Hotline/Models/ApplicationState.swift | 2 +- 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 index f8d8bcf..9395a0d 100644 Binary files a/Hotline/Assets.xcassets/Server.imageset/Server.png and b/Hotline/Assets.xcassets/Server.imageset/Server.png differ diff --git a/Hotline/Assets.xcassets/Server.imageset/Server@2x.png b/Hotline/Assets.xcassets/Server.imageset/Server@2x.png index effc0f5..d206fbd 100644 Binary files a/Hotline/Assets.xcassets/Server.imageset/Server@2x.png and b/Hotline/Assets.xcassets/Server.imageset/Server@2x.png differ diff --git a/Hotline/Assets.xcassets/Server.imageset/Server@3x.png b/Hotline/Assets.xcassets/Server.imageset/Server@3x.png index 5b17b06..6341189 100644 Binary files a/Hotline/Assets.xcassets/Server.imageset/Server@3x.png and b/Hotline/Assets.xcassets/Server.imageset/Server@3x.png differ diff --git a/Hotline/Assets.xcassets/User.imageset/User.png b/Hotline/Assets.xcassets/User.imageset/User.png index c69a204..0bf463b 100644 Binary files a/Hotline/Assets.xcassets/User.imageset/User.png and b/Hotline/Assets.xcassets/User.imageset/User.png differ diff --git a/Hotline/Assets.xcassets/User.imageset/User@2x.png b/Hotline/Assets.xcassets/User.imageset/User@2x.png index 03f73e9..27712aa 100644 Binary files a/Hotline/Assets.xcassets/User.imageset/User@2x.png and b/Hotline/Assets.xcassets/User.imageset/User@2x.png differ diff --git a/Hotline/Assets.xcassets/User.imageset/User@3x.png b/Hotline/Assets.xcassets/User.imageset/User@3x.png index ec35530..aeda6cf 100644 Binary files a/Hotline/Assets.xcassets/User.imageset/User@3x.png and b/Hotline/Assets.xcassets/User.imageset/User@3x.png differ 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") -- cgit