From 8895d52d298b8b474ec40dd5490d0543545a2782 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 13:16:18 +0900
Subject: [PATCH 1/2] Fix header-text scaling on intro/winner screens

---
 .../Components/TestSceneRoundDisplay.cs       | 40 +++++++++++++++++++
 .../DrawableTournamentHeaderText.cs           | 11 ++---
 .../Components/RoundDisplay.cs                | 14 +++++--
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
new file mode 100644
index 0000000000..6f71627ce4
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
@@ -0,0 +1,40 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneRoundDisplay : TournamentTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableTournamentHeaderText),
+            typeof(DrawableTournamentHeaderLogo),
+        };
+
+        public TestSceneRoundDisplay()
+        {
+            Children = new Drawable[]
+            {
+                new RoundDisplay(new TournamentMatch
+                {
+                    Round =
+                    {
+                        Value = new TournamentRound
+                        {
+                            Name = { Value = "Test Round" }
+                        }
+                    }
+                })
+                {
+                    Margin = new MarginPadding(20)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
index bda696ba00..99d914fed4 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
@@ -11,9 +11,13 @@ namespace osu.Game.Tournament.Components
 {
     public class DrawableTournamentHeaderText : CompositeDrawable
     {
-        public DrawableTournamentHeaderText()
+        public DrawableTournamentHeaderText(bool center = true)
         {
-            InternalChild = new TextSprite();
+            InternalChild = new TextSprite
+            {
+                Anchor = center ? Anchor.Centre : Anchor.TopLeft,
+                Origin = center ? Anchor.Centre : Anchor.TopLeft,
+            };
 
             Height = 22;
             RelativeSizeAxes = Axes.X;
@@ -27,9 +31,6 @@ namespace osu.Game.Tournament.Components
                 RelativeSizeAxes = Axes.Both;
                 FillMode = FillMode.Fit;
 
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-
                 Texture = textures.Get("header-text");
             }
         }
diff --git a/osu.Game.Tournament/Components/RoundDisplay.cs b/osu.Game.Tournament/Components/RoundDisplay.cs
index bebede6782..c0002e6804 100644
--- a/osu.Game.Tournament/Components/RoundDisplay.cs
+++ b/osu.Game.Tournament/Components/RoundDisplay.cs
@@ -12,19 +12,27 @@ namespace osu.Game.Tournament.Components
     {
         public RoundDisplay(TournamentMatch match)
         {
-            AutoSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
 
             InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
                 {
-                    AutoSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new DrawableTournamentHeaderText(),
+                        new DrawableTournamentHeaderText(false)
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                        },
                         new TournamentSpriteText
                         {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
                             Text = match.Round.Value?.Name.Value ?? "Unknown Round",
                             Font = OsuFont.Torus.With(size: 26, weight: FontWeight.SemiBold)
                         },

From e56d0f2eeaaed4fce4faded742b5fdb6ac3b93d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:16:10 +0900
Subject: [PATCH 2/2] Add black font weighting

---
 osu.Game/Graphics/OsuFont.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 255f7f24f7..7c78141b4d 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -136,5 +136,10 @@ namespace osu.Game.Graphics
         /// Equivalent to weight 700.
         /// </summary>
         Bold = 700,
+
+        /// <summary>
+        /// Equivalent to weight 900.
+        /// </summary>
+        Black = 900
     }
 }