Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-07-19 22:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Position macOS seek preview just above the progress bar

Browse Source 
The storyboard seek preview was anchored to the top of the control-bar
pill and floated well above it. Anchor the preview and chapter capsule up
from the pill bottom (via geometry height) so they overlap the button row
and sit just above the progress bar, matching iOS proximity.
This commit is contained in:
Arkadiusz Fal
2026-06-20 22:49:22 +02:00
parent e37ac12565
commit 71eb2aacc7
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Yattee/Views/Player/macOS/MacOSControlBar.swift
View File

@@ -82,35 +82,46 @@ struct MacOSControlBar: View {
.frame(maxWidth: 500)
.glassBackground(.regular, in: .rect(cornerRadius: 16), colorScheme: globalSettings.controlBarTheme.colorScheme)
.shadow(color: .black.opacity(0.3), radius: 8, y: 4)
// Seek preview overlay - positioned above the control bar
// Seek preview overlay - positioned just above the progress bar (overlapping the bar)
.overlay(alignment: .bottom) {
if (isDragging || isHoveringProgress), !playerState.isLive {
GeometryReader { geometry in
let pos = seekPreviewPosition(geometry: geometry, previewWidth: playerState.preferredStoryboard != nil ? 176 : 80)
// Position previews just above the progress bar so they overlap the control
// bar (button row) rather than floating above the whole pill. Measured up from
// the pill bottom, so it stays correct regardless of button-row height.
// Bottom inset = pill bottom padding (10) + timeline row height (~20).
let progressBarTop = geometry.size.height - 30
let previewGap: CGFloat = 6
let capsuleDelta: CGFloat = 26
if let storyboard = playerState.preferredStoryboard {
let previewY = progressBarTop - 102 - previewGap // storyboard preview height ~102
seekPreviewView(storyboard: storyboard)
.offset(x: pos.clampedX, y: -150)
.offset(x: pos.clampedX, y: previewY)
if showChapters, let chapter = playerState.chapters.last(where: { $0.startTime <= pos.progress * playerState.duration }) {
ChapterCapsuleView(title: chapter.title, buttonBackground: .none)
.positioned(xTarget: pos.centerX, availableWidth: geometry.size.width)
.offset(y: -176)
.offset(y: previewY - capsuleDelta)
}
} else {
let previewY = progressBarTop - 32 - previewGap // time pill height ~32
SeekTimePreviewView(
seekTime: pos.progress * playerState.duration,
buttonBackground: .none,
theme: .dark
)
.offset(x: pos.clampedX, y: -60)
.offset(x: pos.clampedX, y: previewY)
.transition(.opacity.combined(with: .scale(scale: 0.9)))
.animation(.easeInOut(duration: 0.15), value: isDragging || isHoveringProgress)
if showChapters, let chapter = playerState.chapters.last(where: { $0.startTime <= pos.progress * playerState.duration }) {
ChapterCapsuleView(title: chapter.title, buttonBackground: .none)
.positioned(xTarget: pos.centerX, availableWidth: geometry.size.width)
.offset(y: -86)
.offset(y: previewY - capsuleDelta)
}
}
}