🐞 Make system window manager work on multi-screen setups

MrKai77 · Dec 28, 2024 · d7eec27 · d7eec27
1 parent 706a942
commit d7eec27
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Loop/Extensions/Notification+Extensions.swift b/Loop/Extensions/Notification+Extensions.swift
@@ -15,6 +15,7 @@ extension Notification.Name {
     static let didLoop = Notification.Name("didLoop")
     static let activeStateChanged = Notification.Name("activeStateChanged")
 
+    static let systemWindowManagerStateChanged = Notification.Name("systemWindowManagerStateChanged")
     static let keybindsUpdated = Notification.Name("keybindsUpdated")
 
     static let didImportKeybindsSuccessfully = Notification.Name("didImportKeybindsSuccessfully")

diff --git a/Loop/Luminare/Loop/AdvancedConfiguration.swift b/Loop/Luminare/Loop/AdvancedConfiguration.swift
@@ -12,7 +12,10 @@ import SwiftUI
 
 class AdvancedConfigurationModel: ObservableObject {
     @Published var useSystemWindowManagerWhenAvailable = Defaults[.useSystemWindowManagerWhenAvailable] {
-        didSet { Defaults[.useSystemWindowManagerWhenAvailable] = useSystemWindowManagerWhenAvailable }
+        didSet {
+            Defaults[.useSystemWindowManagerWhenAvailable] = useSystemWindowManagerWhenAvailable
+            Notification.Name.systemWindowManagerStateChanged.post()
+        }
     }
 
     @Published var animateWindowResizes = Defaults[.animateWindowResizes] {

diff --git a/Loop/Luminare/Settings/Behavior/BehaviorConfiguration.swift b/Loop/Luminare/Settings/Behavior/BehaviorConfiguration.swift
@@ -124,6 +124,9 @@ struct BehaviorConfigurationView: View {
                 }
             }
         }
+        .onReceive(.systemWindowManagerStateChanged) { _ in
+            model.useSystemWindowManagerWhenAvailable = Defaults[.useSystemWindowManagerWhenAvailable]
+        }
 
         LuminareSection("Cursor") {
             LuminareToggle("Use screen with cursor", isOn: $model.useScreenWithCursor)

diff --git a/Loop/Window Management/WindowEngine.swift b/Loop/Window Management/WindowEngine.swift
@@ -30,7 +30,7 @@ enum WindowEngine {
             window.activate()
         }
 
-        if #available(macOS 15, *), Defaults[.useSystemWindowManagerWhenAvailable] {
+        if #available(macOS 15, *), Defaults[.useSystemWindowManagerWhenAvailable], !willChangeScreens {
             SystemWindowManager.MoveAndResize.syncPadding()
 
             // System resizes seem to only be able to be performed on the frontmost app