hl-valdemar/terebi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

fix: keep sidebar header controls visible

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-10-18 01:27:19 +02:00
parent fc857870de
commit 2690a22d39
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/App/TerebiApp.swift
+19 -17
View File
@@ -2043,16 +2043,9 @@ private struct PlayerContent: View {
.frame(height: 24)
.background(PlayerGlass(cornerRadius: 8).clipShape(RoundedRectangle(cornerRadius: 8)).allowsHitTesting(false))
Spacer(minLength: 12)
if model.showsQueue {
HStack(spacing: 4) {
Text("Queue").fontWeight(.semibold)
Text("\(model.queue.items.count)").foregroundStyle(.secondary)
}
.font(.system(size: 13))
.padding(.trailing, 8)
.accessibilityElement(children: .combine)
if !model.showsQueue {
titleControls
}
titleControls
}
.padding(.leading, model.isFullScreen ? 16 : 86)
.padding(.trailing, 12)
@@ -2249,6 +2242,18 @@ private struct PlayerContent: View {
private var queueSidebar: some View {
VStack(spacing: 0) {
HStack(spacing: 4) {
HStack(spacing: 4) {
Text("Queue").fontWeight(.semibold)
Text("\(model.queue.items.count)").foregroundStyle(.secondary)
}
.font(.system(size: 13))
.accessibilityElement(children: .combine)
Spacer(minLength: 4)
titleControls
}
.padding(.horizontal, 12)
.frame(height: 32)
HStack {
iconButton("backward.end.fill", "Previous Queue Item") { model.advanceQueue(-1) }
.disabled(!model.canPreviousQueueItem)
@@ -2309,7 +2314,6 @@ private struct PlayerContent: View {
}
}
.frame(width: 260)
.padding(.top, 32)
.background(PlayerGlass(cornerRadius: 0))
.dropDestination(for: URL.self) { urls, _ in
guard model.canOpen, urls.contains(where: \.isFileURL) else { return false }
@@ -2327,12 +2331,6 @@ private struct PlayerContent: View {
queueSidebar
}
}
.overlay(alignment: .top) {
titlebar
.opacity(model.isCompact || model.compactWindow.isTransitioning ? 0 : 1)
.allowsHitTesting(!model.isCompact && !model.compactWindow.isTransitioning && model.controlsVisible)
.accessibilityHidden(model.isCompact || model.compactWindow.isTransitioning || !model.controlsVisible)
}
.frame(minWidth: model.isCompact || model.compactWindow.isTransitioning ? 160 : (model.showsQueue ? 660 : 400),
minHeight: model.isCompact || model.compactWindow.isTransitioning ? model.compactContentMinimumHeight : 240)
.ignoresSafeArea()
@@ -2554,7 +2552,11 @@ private struct PlayerContent: View {
.allowsHitTesting(model.isCompact)
.accessibilityHidden(!model.isCompact)
titlebar
.frame(width: geometry.size.width)
.opacity(model.isCompact || model.compactWindow.isTransitioning ? 0 : 1)
.allowsHitTesting(!model.isCompact && !model.compactWindow.isTransitioning && model.controlsVisible)
.accessibilityHidden(model.isCompact || model.compactWindow.isTransitioning || !model.controlsVisible)
if model.canTogglePlayback {
playbackControls
.frame(width: 440, height: controlHeight)