From 7f4ea5d522de3dc6c53d9e6cb892720b580c47c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 May 2022 18:12:28 +0900
Subject: [PATCH] Use left alignment and remove hacky text positioning code

---
 osu.Game/Screens/Edit/BottomBar.cs                    | 2 +-
 osu.Game/Screens/Edit/Components/TimeInfoContainer.cs | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/BottomBar.cs b/osu.Game/Screens/Edit/BottomBar.cs
index 0f857940b3..5994184c11 100644
--- a/osu.Game/Screens/Edit/BottomBar.cs
+++ b/osu.Game/Screens/Edit/BottomBar.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit
                         RelativeSizeAxes = Axes.Both,
                         ColumnDimensions = new[]
                         {
-                            new Dimension(GridSizeMode.Absolute, 220),
+                            new Dimension(GridSizeMode.Absolute, 170),
                             new Dimension(),
                             new Dimension(GridSizeMode.Absolute, 220),
                             new Dimension(GridSizeMode.Absolute, 120),
diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index 6024716f4b..bd5377e578 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -31,8 +31,8 @@ namespace osu.Game.Screens.Edit.Components
             {
                 trackTimer = new OsuSpriteText
                 {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Spacing = new Vector2(-2, 0),
                     Font = OsuFont.Torus.With(size: 36, fixedWidth: true, weight: FontWeight.Light),
                     Y = -10,
@@ -40,9 +40,9 @@ namespace osu.Game.Screens.Edit.Components
                 bpm = new OsuSpriteText
                 {
                     Colour = colours.Orange1,
-                    Anchor = Anchor.CentreRight,
+                    Anchor = Anchor.CentreLeft,
                     Font = OsuFont.Torus.With(size: 18, weight: FontWeight.SemiBold),
-                    Y = 5,
+                    Position = new Vector2(2, 5),
                 }
             };
         }
@@ -52,7 +52,6 @@ namespace osu.Game.Screens.Edit.Components
             base.Update();
             trackTimer.Text = editorClock.CurrentTime.ToEditorFormattedString();
             bpm.Text = @$"{editorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime).BPM:0} BPM";
-            bpm.X = 5 - trackTimer.DrawWidth;
         }
     }
 }