✨ #128 Adjust window frame in real-time when preview is disabled

MrKai77 · Dec 24, 2023 · 9764b85 · 9764b85
1 parent b4d10cc
commit 9764b85
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -137,6 +137,15 @@ class LoopManager: ObservableObject {
 
             DispatchQueue.main.async {
                 Notification.Name.directionChanged.post(userInfo: ["direction": self.currentResizeDirection])
+
+                if !Defaults[.previewVisibility] {
+                    WindowEngine.resize(
+                        self.targetWindow!,
+                        to: self.currentResizeDirection,
+                        self.screenWithMouse!,
+                        supressAnimations: true
+                    )
+                }
             }
 
             NSHapticFeedbackManager.defaultPerformer.perform(
@@ -257,7 +266,13 @@ class LoopManager: ObservableObject {
             self.currentResizeDirection != .noAction &&
             self.isLoopActive {
 
-            WindowEngine.resize(self.targetWindow!, to: self.currentResizeDirection, self.screenWithMouse!)
+            if Defaults[.previewVisibility] {
+                WindowEngine.resize(
+                    self.targetWindow!,
+                    to: self.currentResizeDirection,
+                    self.screenWithMouse!
+                )
+            }
 
             // This rotates the menubar icon
             Notification.Name.didLoop.post()

diff --git a/Loop/Settings/PreviewSettingsView.swift b/Loop/Settings/PreviewSettingsView.swift
@@ -15,10 +15,28 @@ struct PreviewSettingsView: View {
     @Default(.previewCornerRadius) var previewCornerRadius
     @Default(.previewBorderThickness) var previewBorderThickness
 
+    @Default(.animateWindowResizes) var animateWindowResizes
+
     var body: some View {
         Form {
             Section("Behavior") {
-                Toggle("Show Preview when looping", isOn: $previewVisibility)
+                Toggle(isOn: $previewVisibility) {
+                    VStack(alignment: .leading) {
+                        Text("Show Preview when looping")
+
+                        if !previewVisibility {
+                            VStack(alignment: .leading) {
+                                Text("Adjusts window frame in real-time as you choose a direction.")
+
+                                if self.animateWindowResizes {
+                                    Text("Windows will not animate their resizes.")
+                                }
+                            }
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+                        }
+                    }
+                }
             }
 
             Section {

diff --git a/Loop/Window Management/WindowEngine.swift b/Loop/Window Management/WindowEngine.swift
@@ -15,7 +15,7 @@ struct WindowEngine {
     ///   - window: Window to be resized
     ///   - direction: WindowDirection
     ///   - screen: Screen the window should be resized on
-    static func resize(_ window: Window, to direction: WindowDirection, _ screen: NSScreen) {
+    static func resize(_ window: Window, to direction: WindowDirection, _ screen: NSScreen, supressAnimations: Bool = false) {
         guard direction != .noAction else { return }
         window.activate()
 
@@ -47,7 +47,7 @@ struct WindowEngine {
         }
         var targetWindowFrame = WindowEngine.applyPadding(currentWindowFrame, direction)
 
-        var animate =  Defaults[.animateWindowResizes]
+        var animate =  (!supressAnimations && Defaults[.animateWindowResizes])
         if animate {
             if PermissionsManager.ScreenRecording.getStatus() == false {
                 PermissionsManager.ScreenRecording.requestAccess()