Skip to content

Commit 74d3d9c

Browse files
committed
Give more breathing room in leaderboard scores
1 parent 93da7f9 commit 74d3d9c

File tree

1 file changed

+30
-17
lines changed

1 file changed

+30
-17
lines changed

osu.Game/Online/Leaderboards/LeaderboardScore.cs

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ private void load(IAPIProvider api, OsuColour colour)
189189
RelativeSizeAxes = Axes.Y,
190190
Direction = FillDirection.Horizontal,
191191
Spacing = new Vector2(5f, 0f),
192-
Width = 87f,
192+
Width = 114f,
193193
Masking = true,
194194
Children = new Drawable[]
195195
{
@@ -212,15 +212,6 @@ private void load(IAPIProvider api, OsuColour colour)
212212
},
213213
},
214214
},
215-
new FillFlowContainer
216-
{
217-
Origin = Anchor.CentreLeft,
218-
Anchor = Anchor.CentreLeft,
219-
AutoSizeAxes = Axes.Both,
220-
Direction = FillDirection.Horizontal,
221-
Margin = new MarginPadding { Left = edge_margin },
222-
Children = statisticsLabels
223-
},
224215
},
225216
},
226217
},
@@ -240,6 +231,7 @@ private void load(IAPIProvider api, OsuColour colour)
240231
GlowColour = Color4Extensions.FromHex(@"83ccfa"),
241232
Current = scoreManager.GetBindableTotalScoreString(Score),
242233
Font = OsuFont.Numeric.With(size: 23),
234+
Margin = new MarginPadding { Top = 1 },
243235
},
244236
RankContainer = new Container
245237
{
@@ -256,13 +248,33 @@ private void load(IAPIProvider api, OsuColour colour)
256248
},
257249
},
258250
},
259-
modsContainer = new FillFlowContainer<ModIcon>
251+
new FillFlowContainer
260252
{
253+
AutoSizeAxes = Axes.Both,
261254
Anchor = Anchor.BottomRight,
262255
Origin = Anchor.BottomRight,
263-
AutoSizeAxes = Axes.Both,
264256
Direction = FillDirection.Horizontal,
265-
ChildrenEnumerable = Score.Mods.AsOrdered().Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
257+
Spacing = new Vector2(5),
258+
Children = new Drawable[]
259+
{
260+
new FillFlowContainer
261+
{
262+
Anchor = Anchor.CentreRight,
263+
Origin = Anchor.CentreRight,
264+
AutoSizeAxes = Axes.Both,
265+
Direction = FillDirection.Horizontal,
266+
Margin = new MarginPadding { Left = edge_margin },
267+
Children = statisticsLabels
268+
},
269+
modsContainer = new FillFlowContainer<ModIcon>
270+
{
271+
Anchor = Anchor.CentreRight,
272+
Origin = Anchor.CentreRight,
273+
AutoSizeAxes = Axes.Both,
274+
Direction = FillDirection.Horizontal,
275+
ChildrenEnumerable = Score.Mods.AsOrdered().Select(mod => new ModIcon(mod) { Scale = new Vector2(0.28f) })
276+
},
277+
}
266278
},
267279
},
268280
},
@@ -330,7 +342,7 @@ protected override void OnHoverLost(HoverLostEvent e)
330342

331343
private partial class ScoreComponentLabel : Container, IHasTooltip
332344
{
333-
private const float icon_size = 20;
345+
private const float icon_size = 16;
334346
private readonly FillFlowContainer content;
335347

336348
public override bool Contains(Vector2 screenSpacePos) => content.Contains(screenSpacePos);
@@ -346,7 +358,7 @@ public ScoreComponentLabel(LeaderboardScoreStatistic statistic)
346358
{
347359
AutoSizeAxes = Axes.Both,
348360
Direction = FillDirection.Horizontal,
349-
Padding = new MarginPadding { Right = 10 },
361+
Padding = new MarginPadding { Right = 5 },
350362
Children = new Drawable[]
351363
{
352364
new Container
@@ -381,7 +393,8 @@ public ScoreComponentLabel(LeaderboardScoreStatistic statistic)
381393
Anchor = Anchor.CentreLeft,
382394
Origin = Anchor.CentreLeft,
383395
Text = statistic.Value,
384-
Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold, fixedWidth: true)
396+
Spacing = new Vector2(-1, 0),
397+
Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, fixedWidth: true)
385398
},
386399
},
387400
};
@@ -412,7 +425,7 @@ private partial class DateLabel : DrawableDate
412425
public DateLabel(DateTimeOffset date)
413426
: base(date)
414427
{
415-
Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold, italics: true);
428+
Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold, italics: true);
416429
}
417430

418431
protected override string Format() => Date.ToShortRelativeTime(TimeSpan.FromSeconds(30));

0 commit comments

Comments
 (0)