diff --git a/Shared/Player/ChaptersView.swift b/Shared/Player/ChaptersView.swift index 58534627..e0d01a0d 100644 --- a/Shared/Player/ChaptersView.swift +++ b/Shared/Player/ChaptersView.swift @@ -18,11 +18,14 @@ struct ChaptersView: View { .buttonStyle(.plain) } } + .listRowBackground(Color.clear) } #if os(macOS) .listStyle(.inset) #elseif os(iOS) .listStyle(.grouped) + .backport + .scrollContentBackground(false) #else .listStyle(.plain) #endif diff --git a/Shared/Player/Controls/PlayerControls.swift b/Shared/Player/Controls/PlayerControls.swift index 9f1d3a48..2ba1cc60 100644 --- a/Shared/Player/Controls/PlayerControls.swift +++ b/Shared/Player/Controls/PlayerControls.swift @@ -44,7 +44,7 @@ struct PlayerControls: View { buttonsBar HStack { - if !player.currentVideo.isNil, player.playingFullScreen { + if !player.currentVideo.isNil, fullScreenLayout { Button { withAnimation(Self.animation) { model.presentingDetailsOverlay = true diff --git a/Shared/Player/Controls/TimelineView.swift b/Shared/Player/Controls/TimelineView.swift index e9205c56..e9573851 100644 --- a/Shared/Player/Controls/TimelineView.swift +++ b/Shared/Player/Controls/TimelineView.swift @@ -138,22 +138,22 @@ struct TimelineView: View { .zIndex(3) } - Circle() + Rectangle() .contentShape(Rectangle()) - .foregroundColor(.clear) - .background( + .foregroundColor(Color.clear) + .overlay( ZStack { Circle() .fill(dragging ? .white : .gray) - .frame(maxWidth: 8) + .frame(width: 13) Circle() .fill(dragging ? .gray : .white) - .frame(maxWidth: 6) + .frame(width: 11) } ) .offset(x: thumbOffset) - .frame(maxWidth: thumbAreaWidth, minHeight: thumbAreaWidth) + .frame(width: thumbAreaWidth, height: thumbAreaWidth) #if !os(tvOS) .gesture( diff --git a/Shared/Player/VideoPlayerView.swift b/Shared/Player/VideoPlayerView.swift index e38a9e7c..2a87d53f 100644 --- a/Shared/Player/VideoPlayerView.swift +++ b/Shared/Player/VideoPlayerView.swift @@ -411,6 +411,8 @@ struct VideoPlayerView: View { player.backend.setNeedsDrawing(false) player.exitFullScreen() } + + viewDragOffset = Self.hiddenOffset } else { withAnimation(.linear(duration: 0.2)) { viewDragOffset = 0