diff --git a/Fixtures/View+Fixtures.swift b/Fixtures/View+Fixtures.swift index 64d571e4..da7eb176 100644 --- a/Fixtures/View+Fixtures.swift +++ b/Fixtures/View+Fixtures.swift @@ -51,7 +51,7 @@ struct FixtureEnvironmentObjectsModifier: ViewModifier { } private var playerControls: PlayerControlsModel { - PlayerControlsModel(presentingControls: true, presentingControlsOverlay: false, player: player) + PlayerControlsModel(presentingControls: false, presentingControlsOverlay: true, player: player) } private var subscriptions: SubscriptionsModel { diff --git a/Shared/Player/Controls/ControlsOverlay.swift b/Shared/Player/Controls/ControlsOverlay.swift index 77d6aa33..407931a8 100644 --- a/Shared/Player/Controls/ControlsOverlay.swift +++ b/Shared/Player/Controls/ControlsOverlay.swift @@ -140,7 +140,7 @@ struct ControlsOverlay: View { } #if os(macOS) .buttonStyle(.bordered) - #else + #elseif os(tvOS) .modifier(ControlBackgroundModifier()) .clipShape(RoundedRectangle(cornerRadius: 4)) #endif diff --git a/Shared/Player/VideoPlayerView.swift b/Shared/Player/VideoPlayerView.swift index 2cdb27ab..a95cdd8e 100644 --- a/Shared/Player/VideoPlayerView.swift +++ b/Shared/Player/VideoPlayerView.swift @@ -66,28 +66,40 @@ struct VideoPlayerView: View { if playerControls.presentingControlsOverlay { HStack { - ControlsOverlay() - #if os(tvOS) - .onExitCommand { - withAnimation(PlayerControls.animation) { - playerControls.hideOverlays() + HStack { + #if !os(tvOS) + Spacer() + #endif + ControlsOverlay() + #if os(tvOS) + .onExitCommand { + withAnimation(PlayerControls.animation) { + playerControls.hideOverlays() + } } - } - .onPlayPauseCommand { - player.togglePlay() - } - #else - .frame(maxWidth: overlayWidth) - #endif + .onPlayPauseCommand { + player.togglePlay() + } + #endif .padding() .modifier(ControlBackgroundModifier()) .clipShape(RoundedRectangle(cornerRadius: 4)) .transition(.opacity) + + #if !os(tvOS) + Spacer() + #endif + } + #if os(macOS) + .frame(width: player.playerSize.width) + #endif + + #if !os(tvOS) + Spacer() + #endif } #if os(tvOS) .clipShape(RoundedRectangle(cornerRadius: 10)) - #else - .frame(maxWidth: player.playerSize.width) #endif } } @@ -105,9 +117,9 @@ struct VideoPlayerView: View { return GeometryReader { geometry in HSplitView { content - .onAppear { - playerSize = geometry.size - } + } + .onAppear { + playerSize = geometry.size } } .alert(isPresented: $navigation.presentingAlertInVideoPlayer) { navigation.alert }