fix: skip resizing window when opening file in full screen mode

godly-devotion · Apr 23, 2024 · b35faa4 · b35faa4
1 parent 2978cdf
commit b35faa4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Front Row/Support/PlayEngine.swift b/Front Row/Support/PlayEngine.swift
@@ -223,7 +223,7 @@ import SwiftUI
             .sink { [weak self] size in
                 guard let self else { return }
                 videoSize = size
-                fitToVideoSize()
+                fitToVideoSize(skipResize: WindowController.shared.isFullscreen)
             }
             .store(in: &currentItemSubs)
 
@@ -331,7 +331,7 @@ import SwiftUI
         item.step(byCount: byCount)
     }
 
-    func fitToVideoSize() {
+    func fitToVideoSize(skipResize: Bool = false) {
         guard let window = NSApp.windows.first else { return }
         guard videoSize != CGSize.zero else {
             /// reset aspect ratio setting
@@ -356,7 +356,9 @@ import SwiftUI
             )
             newFrame = NSRect(origin: newOrigin, size: newSize)
         }
-        window.setFrame(newFrame, display: true, animate: true)
+        if !skipResize {
+            window.setFrame(newFrame, display: true, animate: true)
+        }
         window.aspectRatio = videoSize
     }
 

diff --git a/Front Row/Views/SeekSliderView.swift b/Front Row/Views/SeekSliderView.swift
@@ -47,7 +47,7 @@ struct SeekSliderView: NSViewRepresentable {
             let barRect = rect
             let path = NSBezierPath(roundedRect: barRect, xRadius: barRadius, yRadius: barRadius)
 
-            // draw left
+            /// draw left
             let pathLeftRect: NSRect = NSMakeRect(
                 barRect.origin.x, barRect.origin.y, progress, barRect.height)
             NSBezierPath(rect: pathLeftRect).addClip()
@@ -63,7 +63,7 @@ struct SeekSliderView: NSViewRepresentable {
             path.fill()
             NSGraphicsContext.restoreGraphicsState()
 
-            // draw right
+            /// draw right
             NSGraphicsContext.saveGraphicsState()
             let pathRight = NSMakeRect(
                 barRect.origin.x + progress, barRect.origin.y, barRect.width - progress,
@@ -93,7 +93,7 @@ struct SeekSliderView: NSViewRepresentable {
             if percentage.isNaN {
                 percentage = 0.0
             }
-            // The usable width of the bar is reduced by the width of the knob.
+            /// The usable width of the bar is reduced by the width of the knob.
             let effectiveBarWidth = barRect.width - knobWidth
             let pos = barRect.origin.x + CGFloat(percentage) * effectiveBarWidth
             let rect = super.knobRect(flipped: flipped)