From a7f8e26e3572f97b9bd085c202dc214e88bcac5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 18:51:53 +0900
Subject: [PATCH] Adjust bottom-right elements positions based on song progress
 display

---
 osu.Game/Screens/Play/HUDOverlay.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f20127bc63..9d7b3f55be 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Play
 
         private readonly Container topScoreContainer;
 
+        private FillFlowContainer bottomRightElements;
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -119,16 +121,16 @@ namespace osu.Game.Screens.Play
                         },
                         RowDimensions = new[]
                         {
-                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(),
                             new Dimension(GridSizeMode.AutoSize)
                         }
                     },
                 },
-                new FillFlowContainer
+                bottomRightElements = new FillFlowContainer
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    Position = -new Vector2(5, TwoLayerButton.SIZE_RETRACTED.Y),
+                    X = -5,
                     AutoSizeAxes = Axes.Both,
                     LayoutDuration = fade_duration / 2,
                     LayoutEasing = fade_easing,
@@ -209,6 +211,12 @@ namespace osu.Game.Screens.Play
             replayLoaded.BindValueChanged(replayLoadedValueChanged, true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            bottomRightElements.Y = -Progress.Height;
+        }
+
         private void replayLoadedValueChanged(ValueChangedEvent<bool> e)
         {
             PlayerSettingsOverlay.ReplayLoaded = e.NewValue;