Skip to content

Commit 54615d4

Browse files
author
scyc314
committed
scoreboard bold, width fix
1 parent 0e564fd commit 54615d4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Moblin/VideoEffects/Scoreboard/ScoreboardEffectModularView.swift

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ struct ScoreboardEffectModularView: View {
4343
HStack(alignment: .top, spacing: 0) {
4444
let maxHistory = calculateMaxHistory()
4545
let histWidth = modular.fontSize() * 1.5
46+
let secondaryBoxWidth = fontSize() * 1.55
47+
let dynamicWidth = CGFloat(modular.width) - CGFloat(secondaryBoxWidth) + CGFloat(maxHistory) * CGFloat(histWidth)
4648
VStack(spacing: 0) {
4749
stackedHistoryTeam(
4850
team: config.team1,
@@ -59,7 +61,8 @@ struct ScoreboardEffectModularView: View {
5961
histWidth: histWidth
6062
)
6163
}
62-
.frame(width: CGFloat(modular.width) + CGFloat(maxHistory - 1) * histWidth)
64+
.frame(width: dynamicWidth)
65+
//.frame(width: CGFloat(modular.width) + CGFloat(maxHistory - 1) * histWidth)
6366
infoBox()
6467
}
6568
}
@@ -76,7 +79,7 @@ struct ScoreboardEffectModularView: View {
7679
let height = CGFloat(modular.rowHeight)
7780
HStack(spacing: 0) {
7881
teamName(team: modularTeam)
79-
.padding(.leading, 6)
82+
.padding(.leading, 8)
8083
.padding(.trailing, 2)
8184
.frame(maxWidth: .infinity, alignment: .leading)
8285
possession(show: team.possession)
@@ -284,10 +287,10 @@ struct ScoreboardEffectModularView: View {
284287
if let label, !label.isEmpty {
285288
VStack(spacing: -2) {
286289
Text(label)
287-
.font(.system(size: fontSize * 0.25, weight: .bold))
290+
.font(.system(size: fontSize * 0.25))
288291
.offset(x: 0, y: fontSize * 0.04)
289292
Text(value)
290-
.font(.system(size: fontSize * 0.75, weight: weight))
293+
.font(.system(size: fontSize * 0.75, weight: weight)) //the bold toggle doesn't seem to impact the team name
291294
}
292295
} else {
293296
Text(value)

0 commit comments

Comments
 (0)