diff --git a/Shared/Player/VideoPlayerSizeModifier.swift b/Shared/Player/VideoPlayerSizeModifier.swift index f1d07ed6..8fb0ff17 100644 --- a/Shared/Player/VideoPlayerSizeModifier.swift +++ b/Shared/Player/VideoPlayerSizeModifier.swift @@ -27,10 +27,7 @@ struct VideoPlayerSizeModifier: ViewModifier { content .frame(width: geometry.size.width) .frame(maxHeight: maxHeight) - - #if !os(macOS) .aspectRatio(ratio, contentMode: usedAspectRatioContentMode) - #endif } var ratio: CGFloat? { // swiftlint:disable:this no_cgfloat @@ -46,10 +43,10 @@ struct VideoPlayerSizeModifier: ViewModifier { } var usedAspectRatioContentMode: ContentMode { - #if os(iOS) - fullScreen ? .fill : .fit - #else + #if os(tvOS) .fit + #else + fullScreen ? .fill : .fit #endif } diff --git a/Shared/Player/VideoPlayerView.swift b/Shared/Player/VideoPlayerView.swift index 568a9a1f..f9463d6a 100644 --- a/Shared/Player/VideoPlayerView.swift +++ b/Shared/Player/VideoPlayerView.swift @@ -22,7 +22,7 @@ struct VideoPlayerView: View { static let defaultAspectRatio = 16 / 9.0 static var defaultMinimumHeightLeft: Double { #if os(macOS) - 300 + 335 #else 200 #endif @@ -156,7 +156,7 @@ struct VideoPlayerView: View { .persistentSystemOverlays(!fullScreenPlayer) #endif #if os(macOS) - .frame(minWidth: 1100, minHeight: 700) + .frame(minWidth: playerSidebar != .never ? 1100 : 650, minHeight: 700) #endif }