From a8df2388eb184c8abb47f4e841a954587d4fef25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:39:27 +0900
Subject: [PATCH] Update design for TimingControlPoint

---
 .../ControlPoints/TimingControlPoint.cs       |  2 +-
 .../Timeline/TimelineControlPointGroup.cs     |  2 ++
 .../Components/Timeline/TimingPointPiece.cs   | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 580642f593..ec20328fab 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         private const double default_beat_length = 60000.0 / 60.0;
 
-        public override Color4 GetRepresentingColour(OsuColour colours) => colours.YellowDark;
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Orange1;
 
         public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index fb69f16792..c4beb40f92 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
+            Origin = Anchor.TopCentre;
+
             X = (float)group.Time;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index ba94916458..cd1470aa0a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -3,15 +3,12 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -31,26 +28,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Origin = Anchor.CentreLeft;
-            Anchor = Anchor.CentreLeft;
+            Margin = new MarginPadding { Vertical = 10 };
+
+            const float corner_radius = 5;
 
             AutoSizeAxes = Axes.Both;
-
-            Color4 colour = point.GetRepresentingColour(colours);
+            Masking = true;
+            CornerRadius = corner_radius;
 
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
-                    Alpha = 0.9f,
-                    Colour = ColourInfo.GradientHorizontal(colour, colour.Opacity(0.5f)),
+                    Colour = point.GetRepresentingColour(colours),
                     RelativeSizeAxes = Axes.Both,
                 },
                 bpmText = new OsuSpriteText
                 {
                     Alpha = 0.9f,
-                    Padding = new MarginPadding(3),
-                    Font = OsuFont.Default.With(size: 40)
+                    Padding = new MarginPadding { Vertical = 3, Horizontal = 6 },
+                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
+                    Colour = colours.B5,
                 }
             };