mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-21 13:55:58 +00:00
Avoid opening the same windows twice
This commit is contained in:
1 parent
0abe71c809
commit
2de2155fbe
2 files changed
+26
-14
No files matched your search
+25
-11
@@ -221,6 +221,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
|
|||||||
|
|
||||||
|
|
||||||
@objc func openPlusScreen() {
|
@objc func openPlusScreen() {
|
||||||
|
// If window already exists and is visible, just bring it to the front
|
||||||
|
if let window = plusWindow, window.isVisible {
|
||||||
|
NSApp.activate(ignoringOtherApps: true)
|
||||||
|
window.makeKeyAndOrderFront(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Create the welcome screen SwiftUI view
|
// Create the welcome screen SwiftUI view
|
||||||
let plusView = PlusView(closeView: {
|
let plusView = PlusView(closeView: {
|
||||||
log("Closing plus screen")
|
log("Closing plus screen")
|
||||||
@@ -228,26 +235,33 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
|
|||||||
})
|
})
|
||||||
|
|
||||||
// Create an NSWindow to host the SwiftUI view
|
// Create an NSWindow to host the SwiftUI view
|
||||||
plusWindow = NSWindow(
|
let window = NSWindow(
|
||||||
contentRect: NSRect(x: 0, y: 0, width: plusViewWidth, height: plusViewHeight),
|
contentRect: NSRect(x: 0, y: 0, width: plusViewWidth, height: plusViewHeight),
|
||||||
styleMask: [.titled, .closable],
|
styleMask: [.titled, .closable],
|
||||||
backing: .buffered,
|
backing: .buffered,
|
||||||
defer: false
|
defer: false
|
||||||
)
|
)
|
||||||
|
|
||||||
plusWindow?.styleMask.insert(.fullSizeContentView)
|
window.styleMask.insert(.fullSizeContentView)
|
||||||
plusWindow?.titleVisibility = .hidden
|
window.titleVisibility = .hidden
|
||||||
plusWindow?.titlebarAppearsTransparent = true
|
window.titlebarAppearsTransparent = true
|
||||||
|
|
||||||
plusWindow?.center()
|
window.center()
|
||||||
plusWindow?.isReleasedWhenClosed = false
|
window.isReleasedWhenClosed = false
|
||||||
plusWindow?.setFrameAutosaveName("PlusScreen")
|
window.setFrameAutosaveName("PlusScreen")
|
||||||
plusWindow?.contentView = NSHostingView(rootView: plusView)
|
window.contentView = NSHostingView(rootView: plusView)
|
||||||
|
|
||||||
|
// Reset reference when closed by red button
|
||||||
|
NotificationCenter.default.addObserver(forName: NSWindow.willCloseNotification, object: window, queue: .main) { [weak self] _ in
|
||||||
|
self?.plusWindow = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
plusWindow = window
|
||||||
|
|
||||||
// Ensure the window is always on top
|
// Ensure the window is always on top
|
||||||
NSApp.activate(ignoringOtherApps: true) // Brings the whole app to the front
|
NSApp.activate(ignoringOtherApps: true)
|
||||||
plusWindow?.makeKeyAndOrderFront(nil)
|
window.makeKeyAndOrderFront(nil)
|
||||||
plusWindow?.level = .normal
|
window.level = .normal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ struct LicensePage: View {
|
|||||||
|
|
||||||
|
|
||||||
func openLicenseWindow() -> NSWindow {
|
func openLicenseWindow() -> NSWindow {
|
||||||
// Create a new NSWindow and retain it in the `newWindow` property
|
|
||||||
let window = NSWindow(
|
let window = NSWindow(
|
||||||
contentRect: NSRect(x: 0, y: 0, width: 500, height: 400),
|
contentRect: NSRect(x: 0, y: 0, width: 500, height: 400),
|
||||||
styleMask: [.titled, .closable, .resizable],
|
styleMask: [.titled, .closable, .resizable],
|
||||||
@@ -44,10 +43,9 @@ func openLicenseWindow() -> NSWindow {
|
|||||||
window.contentView = NSHostingView(rootView: LicensePage())
|
window.contentView = NSHostingView(rootView: LicensePage())
|
||||||
|
|
||||||
// Ensure the window is always on top
|
// Ensure the window is always on top
|
||||||
NSApp.activate(ignoringOtherApps: true) // Brings the whole app to the front
|
NSApp.activate(ignoringOtherApps: true)
|
||||||
window.makeKeyAndOrderFront(nil)
|
window.makeKeyAndOrderFront(nil)
|
||||||
window.level = .normal
|
window.level = .normal
|
||||||
|
|
||||||
// Retain the window to prevent deallocation
|
|
||||||
return window
|
return window
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user