From 7ec2e0e86696eb63b6b1e4995af2263d91d214f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 8 Sep 2024 16:30:09 +0200
Subject: [PATCH] Refactor layout code to be a bit less haphazard

Visually the same, functionally much saner.
---
 .../Screens/Edit/Timing/ControlPointList.cs   | 38 +++++++++++--------
 .../Screens/Edit/Timing/ControlPointTable.cs  |  7 +++-
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointList.cs b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
index 4cc356012f..49e5b76dd6 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointList.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Screens.Edit.Timing
 {
     public partial class ControlPointList : CompositeDrawable
     {
+        private ControlPointTable table = null!;
+        private Container controls = null!;
         private OsuButton deleteButton = null!;
         private RoundedButton addButton = null!;
 
@@ -40,12 +42,12 @@ namespace osu.Game.Screens.Edit.Timing
             const float margins = 10;
             InternalChildren = new Drawable[]
             {
-                new ControlPointTable
+                table = new ControlPointTable
                 {
                     RelativeSizeAxes = Axes.Both,
                     Groups = { BindTarget = Beatmap.ControlPointInfo.Groups, },
                 },
-                new Container
+                controls = new Container
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
@@ -55,15 +57,16 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         new Box
                         {
-                            Height = 50,
-                            RelativeSizeAxes = Axes.X,
-                            Anchor = Anchor.CentreLeft,
-                            Colour = overlayColourProvider.Background2,
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colourProvider.Background2,
                         },
                         new FillFlowContainer
                         {
-                            Anchor = Anchor.BottomLeft,
-                            Padding = new MarginPadding { Left = margins, Bottom = margins },
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Padding = new MarginPadding { Left = margins, Vertical = margins, },
                             Children = new Drawable[]
                             {
                                 new RoundedButton
@@ -71,17 +74,19 @@ namespace osu.Game.Screens.Edit.Timing
                                     Text = "Select closest to current time",
                                     Action = goToCurrentGroup,
                                     Size = new Vector2(220, 30),
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
                                 },
                             }
                         },
                         new FillFlowContainer
                         {
+                            AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            Anchor = Anchor.BottomRight,
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
                             Spacing = new Vector2(5),
-                            Padding = new MarginPadding { Right = margins, Bottom = margins },
+                            Padding = new MarginPadding { Right = margins, Vertical = margins, },
                             Children = new Drawable[]
                             {
                                 deleteButton = new RoundedButton
@@ -89,16 +94,16 @@ namespace osu.Game.Screens.Edit.Timing
                                     Text = "-",
                                     Size = new Vector2(30, 30),
                                     Action = delete,
-                                    Anchor = Anchor.BottomRight,
-                                    Origin = Anchor.BottomRight,
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
                                     BackgroundColour = colours.Red3,
                                 },
                                 addButton = new RoundedButton
                                 {
                                     Action = addNew,
                                     Size = new Vector2(160, 30),
-                                    Anchor = Anchor.BottomRight,
-                                    Origin = Anchor.BottomRight,
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
                                 },
                             }
                         },
@@ -132,6 +137,7 @@ namespace osu.Game.Screens.Edit.Timing
             base.Update();
 
             addButton.Enabled.Value = clock.CurrentTimeAccurate != selectedGroup.Value?.Time;
+            table.Padding = new MarginPadding { Bottom = controls.DrawHeight };
         }
 
         private void goToCurrentGroup()
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index dd0cf2116e..fd812cfe2b 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Screens.Edit.Timing
     {
         public BindableList<ControlPointGroup> Groups { get; } = new BindableList<ControlPointGroup>();
 
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
         [Cached]
         private Bindable<TimingControlPoint?> activeTimingPoint { get; } = new Bindable<TimingControlPoint?>();
 
@@ -53,7 +59,6 @@ namespace osu.Game.Screens.Edit.Timing
         private void load(OverlayColourProvider colours)
         {
             RelativeSizeAxes = Axes.Both;
-            Padding = new MarginPadding { Bottom = 50 };
 
             InternalChildren = new Drawable[]
             {