Sync Update - 173295d

Lakr233 · Mar 11, 2022 · 464e37a · 464e37a
1 parent 0937e0a
commit 464e37a
Show file tree

Hide file tree

Showing 49 changed files with 840 additions and 562 deletions.
diff --git a/App.xcworkspace/contents.xcworkspacedata b/App.xcworkspace/contents.xcworkspacedata
diff --git a/Application/Rayon/Extension/Store/RayonStore+SwiftUI.swift b/Application/Rayon/Extension/Store/RayonStore+SwiftUI.swift
diff --git a/Application/Rayon/Extension/UIBridge/PresentError.swift b/Application/Rayon/Extension/UIBridge/PresentError.swift
@@ -22,7 +22,7 @@ extension UIBridge {
         }
     }
 
-    static func presentError(with message: String, delay: Double = 0.5) {
+    static func presentError(with message: String, delay: Double = 0) {
         debugPrint("<InterfaceError> \(message)")
         DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
             let alert = NSAlert()

diff --git a/Application/Rayon/Extension/Utils/Generic.swift b/Application/Rayon/Extension/Utils/Generic.swift
@@ -10,6 +10,16 @@ import RayonModule
 import SwiftUI
 
 enum RayonUtil {
+    static func findWindow() -> NSWindow? {
+        if let key = NSApp.keyWindow {
+            return key
+        }
+        for window in NSApp.windows where window.isVisible {
+            return window
+        }
+        return nil
+    }
+
     static func selectIdentity() -> RDIdentity.ID? {
         assert(!Thread.isMainThread, "select identity must be called from background thread")
 
@@ -20,10 +30,17 @@ enum RayonUtil {
 
         mainActor {
             var panelRef: NSPanel?
+            var windowRef: NSWindow?
             let controller = NSHostingController(rootView: Group {
                 IdentityPickerSheetView {
                     selection = $0
-                    if let panel = panelRef { panel.close() }
+                    if let panel = panelRef {
+                        if let windowRef = windowRef {
+                            windowRef.endSheet(panel)
+                        } else {
+                            panel.close()
+                        }
+                    }
                     sem.signal()
                 }
                 .environmentObject(RayonStore.shared)
@@ -34,13 +51,60 @@ enum RayonUtil {
             panel.title = ""
             panel.titleVisibility = .hidden
 
-            if let keyWindow = NSApp.keyWindow {
+            if let keyWindow = findWindow() {
+                windowRef = keyWindow
+                keyWindow.beginSheet(panel) { _ in }
+            } else {
+                sem.signal()
+            }
+        }
+        sem.wait()
+        return selection
+    }
+
+    static func selectMachine(allowMany: Bool = true) -> [RDMachine.ID] {
+        assert(!Thread.isMainThread, "select identity must be called from background thread")
+
+        var selection = [RDMachine.ID]()
+        let sem = DispatchSemaphore(value: 0)
+
+        debugPrint("Picking Machine")
+
+        mainActor {
+            var panelRef: NSPanel?
+            var windowRef: NSWindow?
+            let controller = NSHostingController(rootView: Group {
+                MachinePickerView(onComplete: {
+                    selection = $0
+                    if let panel = panelRef {
+                        if let windowRef = windowRef {
+                            windowRef.endSheet(panel)
+                        } else {
+                            panel.close()
+                        }
+                    }
+                    sem.signal()
+                }, allowSelectMany: allowMany)
+                    .environmentObject(RayonStore.shared)
+                    .frame(width: 700, height: 400)
+            })
+            let panel = NSPanel(contentViewController: controller)
+            panelRef = panel
+            panel.title = ""
+            panel.titleVisibility = .hidden
+
+            if let keyWindow = findWindow() {
+                windowRef = keyWindow
                 keyWindow.beginSheet(panel) { _ in }
             } else {
-                panel.makeKeyAndOrderFront(nil)
+                sem.signal()
             }
         }
         sem.wait()
         return selection
     }
+
+    static func selectOneMachine() -> RDMachine.ID? {
+        selectMachine(allowMany: false).first
+    }
 }
diff --git a/Application/Rayon/Extension/Window/CreateWindow.swift b/Application/Rayon/Extension/Window/CreateWindow.swift
diff --git a/Application/Rayon/Extension/Window/HostWindow.swift b/Application/Rayon/Extension/Window/HostWindow.swift
diff --git a/Application/Rayon/Interface/ApplicationControllers/Application/MainView.swift b/Application/Rayon/Interface/ApplicationControllers/Application/MainView.swift
@@ -13,9 +13,6 @@ private var isBootstrapCompleted = false
 struct MainView: View {
     @EnvironmentObject var store: RayonStore
 
-    @StateObject
-    var windowObserver: WindowObserver = .init()
-
     @State var openLicenseAgreementView: Bool = false
 
     var body: some View {
@@ -45,33 +42,6 @@ struct MainView: View {
                 .ignoresSafeArea()
                 .animation(.easeInOut(duration: 0.5), value: store.globalProgressInPresent)
         )
-        .background(
-            HostingWindowFinder { [weak windowObserver] window in
-                windowObserver?.window = window
-                guard let window = window else {
-                    return
-                }
-                guard !isBootstrapCompleted else {
-                    return
-                }
-                isBootstrapCompleted = true
-
-                window.tabbingMode = .disallowed
-                let windows = NSApplication
-                    .shared
-                    .windows
-                var notKeyWindow = windows
-                    .filter { !$0.isKeyWindow }
-                if notKeyWindow.count > 0,
-                   notKeyWindow.count == windows.count
-                {
-                    // don't close them all
-                    notKeyWindow.removeFirst()
-                }
-                notKeyWindow.forEach { $0.close() }
-                window.tabbingMode = .automatic
-            }
-        )
         .toolbar {
             ToolbarItem(placement: .navigation) {
                 Button {

diff --git a/Application/Rayon/Interface/ApplicationControllers/Application/Sidebar.swift b/Application/Rayon/Interface/ApplicationControllers/Application/Sidebar.swift
@@ -135,6 +135,7 @@ struct SidebarView: View {
             }
             .sheet(isPresented: $openServerSelector, onDismiss: nil, content: {
                 MachinePickerView(onComplete: { machines in
+                    if machines.isEmpty { return }
                     for machine in machines {
                         terminalManager.createSession(withMachineID: machine)
                     }

diff --git a/Application/Rayon/Interface/ApplicationControllers/Identity/IdentityPickerView.swift b/Application/Rayon/Interface/ApplicationControllers/Identity/IdentityPickerView.swift
@@ -26,11 +26,11 @@ struct IdentityPickerSheetView: View {
             defer {
                 presentationMode.wrappedValue.dismiss()
             }
-            if !confirmed {
+            if confirmed {
+                onComplete(currentSelection)
+            } else {
                 onComplete(nil)
-                return
             }
-            onComplete(currentSelection)
         }
         .sheet(isPresented: $openCreateSheet, onDismiss: nil) {
             EditIdentityManager(selection: .constant(nil)) {

diff --git a/Application/Rayon/Interface/ApplicationControllers/Machine/MachinePickerView.swift b/Application/Rayon/Interface/ApplicationControllers/Machine/MachinePickerView.swift
@@ -25,11 +25,11 @@ struct MachinePickerView: View {
         ) { confirmed in
             var shouldDismiss = false
             defer { if shouldDismiss { presentationMode.wrappedValue.dismiss() } }
-            if !confirmed {
-                shouldDismiss = true
-                return
+            if confirmed {
+                onComplete([RDIdentity.ID](currentSelection))
+            } else {
+                onComplete([])
             }
-            onComplete([RDIdentity.ID](currentSelection))
             shouldDismiss = true
         }
     }
@@ -65,6 +65,7 @@ struct MachinePickerView: View {
                 }
             }
         }
+        .frame(maxHeight: 500)
         .requiresSheetFrame()
     }
 

diff --git a/Application/Rayon/Interface/ApplicationControllers/Machine/MachineView.swift b/Application/Rayon/Interface/ApplicationControllers/Machine/MachineView.swift
@@ -15,7 +15,7 @@ struct MachineView: View {
 
     @State var openEditSheet: Bool = false
 
-    let redactedColor: Color = .green
+    let redactedColor: Color = .accentColor
 
     var body: some View {
         contentView