Skip to content

fix(menubar): isolate currentTime reads to prevent sub-menu flicker #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paaloeye wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −14
Open

fix(menubar): isolate currentTime reads to prevent sub-menu flicker #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions LyricFever/Views/MenubarWindowView/MenubarWindowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,31 @@ import SwiftUI
import LaunchAtLogin
import Translation

// Isolated struct so currentTime updates don't re-render the full MenubarWindowView (which would dismiss open sub-menus).
private struct SongProgressView: View {
@Environment(ViewModel.self) var viewmodel
let lyricsEnabled: Bool

var body: some View {
VStack(spacing: 0) {
ProgressView(value: lyricsEnabled ? viewmodel.currentTime.currentTime : 0, total: Double(viewmodel.duration))
.progressViewStyle(ColoredThinProgressViewStyle(color: .secondary, thickness: 4))
.frame(height: 4)
.padding(.horizontal, 4)
.environment(\.colorScheme, .dark)

HStack {
Text(lyricsEnabled ? viewmodel.formattedCurrentTime : "--:--")
.font(.caption2)
Spacer()
Text(viewmodel.formattedDuration)
.font(.caption2)
}
.padding(.horizontal, 4)
}
}
}

struct MenubarWindowView: View {
@Environment(\.openURL) var openURL
@Environment(\.openWindow) var openWindow
Expand Down Expand Up @@ -140,20 +165,8 @@ struct MenubarWindowView: View {
}
songControls

ProgressView(value: displayLyrics == .enabled ? viewmodel.currentTime.currentTime : 0, total: Double(viewmodel.duration))
.progressViewStyle(ColoredThinProgressViewStyle(color: .secondary, thickness: 4))
.frame(height: 4)
.padding(.horizontal, 4)
.environment(\.colorScheme, .dark)

HStack {
Text(displayLyrics == .enabled ? viewmodel.formattedCurrentTime : "--:--")
.font(.caption2)
Spacer()
Text(viewmodel.formattedDuration)
.font(.caption2)
}
.padding(.horizontal, 4)
SongProgressView(lyricsEnabled: displayLyrics == .enabled)
.environment(viewmodel)
}
}
// even out vertical padding with divider as compared to Menubar button
Expand Down