mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 23:24:32 +00:00
Merge origin/main into bug/terminal-bugs
This commit is contained in:
commit
cdf0785e29
22 changed files with 1363 additions and 353 deletions
|
|
@ -83,12 +83,14 @@ struct MinimalisticMusicPlayerView: View {
|
|||
|
||||
VStack(alignment: .leading, spacing: 1) {
|
||||
if !musicManager.songTitle.isEmpty {
|
||||
MarqueeText(
|
||||
$musicManager.songTitle,
|
||||
MusicTitleMarqueeView(
|
||||
text: musicManager.songTitle,
|
||||
isExplicit: musicManager.isCurrentTrackExplicit,
|
||||
font: .system(size: 12, weight: .semibold),
|
||||
nsFont: .subheadline,
|
||||
textColor: .white,
|
||||
frameWidth: textWidth
|
||||
frameWidth: textWidth,
|
||||
badgeHeight: 13
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -187,7 +187,15 @@ struct MusicControlsView: View {
|
|||
|
||||
private func songInfo(width: CGFloat) -> some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
MarqueeText($musicManager.songTitle, font: .headline, nsFont: .headline, textColor: .white, frameWidth: width)
|
||||
MusicTitleMarqueeView(
|
||||
text: musicManager.songTitle,
|
||||
isExplicit: musicManager.isCurrentTrackExplicit,
|
||||
font: .headline,
|
||||
nsFont: .headline,
|
||||
textColor: .white,
|
||||
frameWidth: width,
|
||||
badgeHeight: 14
|
||||
)
|
||||
MarqueeText(
|
||||
$musicManager.artistName,
|
||||
font: .headline,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue