From 87c9df937f85d3f7e9b220c2f21c13caae74b25b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 31 Oct 2023 12:40:21 +0900 Subject: [PATCH] Move team seed to below team name --- .../Components/DrawableTeamSeed.cs | 6 +++++ .../TournamentSpriteTextWithBackground.cs | 2 +- .../Gameplay/Components/TeamDisplay.cs | 27 ++++++------------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/osu.Game.Tournament/Components/DrawableTeamSeed.cs b/osu.Game.Tournament/Components/DrawableTeamSeed.cs index a79c63e979..077185f5c0 100644 --- a/osu.Game.Tournament/Components/DrawableTeamSeed.cs +++ b/osu.Game.Tournament/Components/DrawableTeamSeed.cs @@ -22,6 +22,12 @@ namespace osu.Game.Tournament.Components [Resolved] private LadderInfo ladder { get; set; } = null!; + [BackgroundDependencyLoader] + private void load() + { + Text.Font = Text.Font.With(size: 36); + } + protected override void LoadComplete() { base.LoadComplete(); diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs index ce118727cd..21439482e3 100644 --- a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs +++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs @@ -29,7 +29,7 @@ namespace osu.Game.Tournament.Components { Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR, Font = OsuFont.Torus.With(weight: FontWeight.SemiBold, size: 50), - Padding = new MarginPadding { Horizontal = 10 }, + Padding = new MarginPadding { Left = 10, Right = 20 }, Text = text, } }; diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs index 49fbc64397..3eec67c639 100644 --- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs +++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs @@ -95,28 +95,17 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components } } }, - new FillFlowContainer + teamNameText = new TournamentSpriteTextWithBackground { - AutoSizeAxes = Axes.Both, - Direction = FillDirection.Horizontal, - Spacing = new Vector2(5), + Scale = new Vector2(0.5f), + Origin = anchor, + Anchor = anchor, + }, + new DrawableTeamSeed(Team) + { + Scale = new Vector2(0.5f), Origin = anchor, Anchor = anchor, - Children = new Drawable[] - { - teamNameText = new TournamentSpriteTextWithBackground - { - Scale = new Vector2(0.5f), - Origin = anchor, - Anchor = anchor, - }, - new DrawableTeamSeed(Team) - { - Scale = new Vector2(0.5f), - Origin = anchor, - Anchor = anchor, - }, - } }, } },