🐛 Fix #46

MrKai77 · Sep 30, 2023 · 756a49b · 756a49b
1 parent d95c17f
commit 756a49b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -138,7 +138,7 @@ class LoopManager {
             self.screenWithMouse = NSScreen.screenWithMouse
 
             if Defaults[.previewVisibility] == true && frontmostWindow != nil {
-                previewController.open(screen: self.screenWithMouse!)
+                previewController.open(screen: self.screenWithMouse!, window: frontmostWindow)
             }
             radialMenuController.open(frontmostWindow: frontmostWindow)
             keybindMonitor.start()

diff --git a/Loop/Managers/SnappingManager.swift b/Loop/Managers/SnappingManager.swift
@@ -42,7 +42,7 @@ class SnappingManager {
                         ignoredFrame: ignoredFrame
                     )
 
-                    self.previewController.open(screen: screen)
+                    self.previewController.open(screen: screen, window: nil)
                     DispatchQueue.main.async {
                         NotificationCenter.default.post(
                             name: Notification.Name.directionChanged,

diff --git a/Loop/Preview Window/PreviewController.swift b/Loop/Preview Window/PreviewController.swift
@@ -11,7 +11,7 @@ class PreviewController {
 
     var loopPreviewWindowController: NSWindowController?
 
-    func open(screen: NSScreen) {
+    func open(screen: NSScreen, window: Window?) {
         if let windowController = loopPreviewWindowController {
             windowController.window?.orderFrontRegardless()
             return
@@ -25,7 +25,7 @@ class PreviewController {
         panel.hasShadow = false
         panel.backgroundColor = NSColor.white.withAlphaComponent(0.00001)
         panel.level = .screenSaver
-        panel.contentView = NSHostingView(rootView: PreviewView())
+        panel.contentView = NSHostingView(rootView: PreviewView(window: window))
         panel.collectionBehavior = .canJoinAllSpaces
         panel.alphaValue = 0
         panel.orderFrontRegardless()

diff --git a/Loop/Preview Window/PreviewView.swift b/Loop/Preview Window/PreviewView.swift
@@ -14,6 +14,13 @@ struct PreviewView: View {
     @State var previewMode = false
 
     @State var currentResizeDirection: WindowDirection = .noAction
+    private let window: Window?
+    private var sidePadding: CGFloat = 0
+
+    init(previewMode: Bool = false, window: Window?) {
+        self.window = window
+        self.sidePadding = previewPadding + previewBorderThickness / 2
+    }
 
     @Default(.useSystemAccentColor) var useSystemAccentColor
     @Default(.customAccentColor) var customAccentColor
@@ -29,7 +36,8 @@ struct PreviewView: View {
         GeometryReader { geo in
             VStack {
                 switch currentResizeDirection {
-                case .bottomHalf,
+                case .center,
+                        .bottomHalf,
                         .bottomRightQuarter,
                         .bottomLeftQuarter,
                         .verticalCenterThird,
@@ -45,7 +53,8 @@ struct PreviewView: View {
 
                 HStack {
                     switch currentResizeDirection {
-                    case .rightHalf,
+                    case .center,
+                            .rightHalf,
                             .topRightQuarter,
                             .bottomRightQuarter,
                             .horizontalCenterThird,
@@ -78,9 +87,12 @@ struct PreviewView: View {
                                 lineWidth: previewBorderThickness
                             )
                     }
-                    .padding(previewPadding + previewBorderThickness/2)
+                    .padding(sidePadding)
                     .frame(width: currentResizeDirection == .noAction ? 0 : nil,
                            height: currentResizeDirection == .noAction ? 0 : nil)
+                    .frame(width: currentResizeDirection == .center ? (window?.size.width ?? 10) - sidePadding : nil,
+                           height: currentResizeDirection == .center ? (window?.size.height ?? 10) - sidePadding : nil)
+
                     .frame(width: currentResizeDirection == .lastDirection ? 0 : nil,
                            height: currentResizeDirection == .lastDirection ? 0 : nil)
                     .frame(width: currentResizeDirection == .topTwoThirds ? geo.size.height / 3 * 2 : nil)
@@ -89,7 +101,8 @@ struct PreviewView: View {
                     .frame(width: currentResizeDirection == .leftTwoThirds ? geo.size.width / 3 * 2 : nil)
 
                     switch currentResizeDirection {
-                    case .leftHalf,
+                    case .center,
+                            .leftHalf,
                             .topLeftQuarter,
                             .bottomLeftQuarter,
                             .horizontalCenterThird,
@@ -105,7 +118,8 @@ struct PreviewView: View {
                 }
 
                 switch currentResizeDirection {
-                case .topHalf,
+                case .center,
+                        .topHalf,
                         .topRightQuarter,
                         .topLeftQuarter,
                         .verticalCenterThird,
@@ -122,7 +136,6 @@ struct PreviewView: View {
         }
         .foregroundColor(.clear)
         .opacity(currentResizeDirection == .noAction ? 0 : 1)
-        .scaleEffect(currentResizeDirection == .center ? 0.8 : 1)
         .animation(.interpolatingSpring(stiffness: 250, damping: 25), value: currentResizeDirection)
         .onReceive(.directionChanged) { obj in
             if !previewMode {

diff --git a/Loop/Settings/PreviewSettingsView.swift b/Loop/Settings/PreviewSettingsView.swift
@@ -22,7 +22,7 @@ struct PreviewSettingsView: View {
             }
 
             Section {
-                PreviewView(previewMode: true)
+                PreviewView(previewMode: true, window: nil)
             }
             .frame(height: 150)
             .opacity(previewVisibility ? 1 : 0.5)