✨ Add option for having padding on windows; close #16

MrKai77 · Sep 2, 2023 · b251c83 · b251c83
2 parents 3d023c1 + 5fb9b0d
commit b251c83
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 6 deletions.
diff --git a/Loop/Extensions/Defaults+Extensions.swift b/Loop/Extensions/Defaults+Extensions.swift
@@ -101,4 +101,5 @@ extension Defaults.Keys {
 
     // BETA
     static let animateWindowResizes = Key<Bool>("animateWindowResizes", default: false)
+    static let windowPadding = Key<CGFloat>("windowPadding", default: 0)
 }
diff --git a/Loop/Helpers/Views/BetaIndicator.swift b/Loop/Helpers/Views/BetaIndicator.swift
@@ -20,7 +20,7 @@ struct BetaIndicator: View {
         Text(text)
             .font(.caption2)
             .padding(.horizontal, 4)
-            .padding(.vertical, 2)
+            .padding(.vertical, 1)
             .background {
                 RoundedRectangle(cornerRadius: 50)
                     .stroke(lineWidth: 1)

diff --git a/Loop/Helpers/WindowDirection.swift b/Loop/Helpers/WindowDirection.swift
@@ -127,4 +127,29 @@ enum WindowDirection: CaseIterable {
         default:                        [[]]
         }
     }
+
+    var sidesThatTouchScreen: [Edge] {
+        switch self {
+        case .maximize:                 [.top, .bottom, .leading, .trailing]
+        case .topHalf:                  [.top, .leading, .trailing]
+        case .rightHalf:                [.top, .bottom, .trailing]
+        case .bottomHalf:               [.bottom, .leading, .trailing]
+        case .leftHalf:                 [.top, .bottom, .leading]
+        case .topLeftQuarter:           [.top, .leading]
+        case .topRightQuarter:          [.top, .trailing]
+        case .bottomRightQuarter:       [.bottom, .trailing]
+        case .bottomLeftQuarter:        [.bottom, .leading]
+        case .rightThird:               [.top, .bottom, .trailing]
+        case .rightTwoThirds:           [.top, .bottom, .trailing]
+        case .horizontalCenterThird:    [.top, .bottom]
+        case .leftThird:                [.top, .bottom, .leading]
+        case .leftTwoThirds:            [.top, .bottom, .leading]
+        case .topThird:                 [.top, .leading, .trailing]
+        case .topTwoThirds:             [.top, .leading, .trailing]
+        case .verticalCenterThird:      [.leading, .trailing]
+        case .bottomThird:              [.bottom, .leading, .trailing]
+        case .bottomTwoThirds:          [.bottom, .leading, .trailing]
+        default:                        []
+        }
+    }
 }
diff --git a/Loop/Helpers/WindowEngine.swift b/Loop/Helpers/WindowEngine.swift
@@ -15,19 +15,20 @@ struct WindowEngine {
         let oldWindowFrame = window.frame
         guard let screenFrame = screen.safeScreenFrame else { return }
         guard var targetWindowFrame = WindowEngine.generateWindowFrame(oldWindowFrame, screenFrame, direction) else { return }
+        targetWindowFrame = WindowEngine.applyPadding(targetWindowFrame, direction)
 
         // Calculate the window's minimum window size and change the target accordingly
         window.getMinSize(screen: screen) { minSize in
             if (targetWindowFrame.minX + minSize.width) > screen.frame.maxX {
-                targetWindowFrame.origin.x = screen.frame.maxX - minSize.width
+                targetWindowFrame.origin.x = screen.frame.maxX - minSize.width - Defaults[.windowPadding]
             }
 
             if (targetWindowFrame.minY + minSize.height) > screen.frame.maxY {
-                targetWindowFrame.origin.y = screen.frame.maxY - minSize.height
+                targetWindowFrame.origin.y = screen.frame.maxY - minSize.height - Defaults[.windowPadding]
             }
 
             // Resize window
-            window.setFrame(targetWindowFrame, animate: true)
+            window.setFrame(targetWindowFrame, animate: Defaults[.animateWindowResizes])
         }
     }
 
@@ -101,4 +102,33 @@ struct WindowEngine {
             return nil
         }
     }
+
+    private static func applyPadding(_ windowFrame: CGRect, _ direction: WindowDirection) -> CGRect {
+        var paddingAppliedRect = windowFrame
+        for side in [Edge.top, Edge.bottom, Edge.leading, Edge.trailing] {
+            if direction.sidesThatTouchScreen.contains(side) {
+                paddingAppliedRect.inset(side, amount: Defaults[.windowPadding])
+            } else {
+                paddingAppliedRect.inset(side, amount: Defaults[.windowPadding] / 2)
+            }
+        }
+        return paddingAppliedRect
+    }
+}
+
+extension CGRect {
+    mutating func inset(_ side: Edge, amount: CGFloat) {
+        switch side {
+        case .top:
+            self.origin.y += amount
+            self.size.height -= amount
+        case .leading:
+            self.origin.x += amount
+            self.size.width -= amount
+        case .bottom:
+            self.size.height -= amount
+        case .trailing:
+            self.size.width -= amount
+        }
+    }
 }
diff --git a/Loop/Settings/Views/GeneralSettingsView.swift b/Loop/Settings/Views/GeneralSettingsView.swift
@@ -21,6 +21,7 @@ struct GeneralSettingsView: View {
     @Default(.currentIcon) var currentIcon
     @Default(.timesLooped) var timesLooped
     @Default(.animateWindowResizes) var animateWindowResizes
+    @Default(.windowPadding) var windowPadding
 
     let iconManager = IconManager()
 
@@ -39,12 +40,23 @@ struct GeneralSettingsView: View {
                         }
                     }
 
-                Toggle(isOn: $animateWindowResizes, label: {
+                Toggle(isOn: $animateWindowResizes) {
                     HStack {
                         Text("Animate windows being resized")
                         BetaIndicator("BETA")
                     }
-                })
+                }
+
+                Slider(value: $windowPadding,
+                       in: 0...25,
+                       step: 5,
+                       minimumValueLabel: Text("0"),
+                       maximumValueLabel: Text("25")) {
+                    HStack {
+                        Text("Window Padding")
+                        BetaIndicator("BETA")
+                    }
+                }
             }
 
             Section("Loop's icon") {

diff --git a/Loop/Settings/Views/MoreSettingsView.swift b/Loop/Settings/Views/MoreSettingsView.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Sparkle
+import Defaults
 
 struct MoreSettingsView: View {