From 495fdd8d65d99d7818726e29829fcd6ff8fed660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:58:51 +0900
Subject: [PATCH] Update drag area display to match new design logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 89a9095d22..493f62921b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
-        public class DragArea : Container
+        public class DragArea : Circle
         {
             private readonly HitObject hitObject;
 
@@ -224,6 +224,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
+                Colour = OsuColour.Gray(0.2f);
 
                 InternalChildren = new Drawable[]
                 {
@@ -234,6 +235,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 };
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                updateState();
+                FinishTransforms();
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 updateState();
@@ -265,7 +274,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             private void updateState()
             {
-                Colour = IsHovered || hasMouseDown ? Color4.OrangeRed : Color4.White;
+                if (hasMouseDown)
+                {
+                    this.ScaleTo(0.7f, 200, Easing.OutQuint);
+                }
+                else if (IsHovered)
+                {
+                    this.ScaleTo(0.8f, 200, Easing.OutQuint);
+                }
+                else
+                {
+                    this.ScaleTo(0.6f, 200, Easing.OutQuint);
+                }
+
+                this.FadeTo(IsHovered || hasMouseDown ? 0.8f : 0.2f, 200, Easing.OutQuint);
             }
 
             [Resolved]
@@ -369,12 +391,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 
+                const float fudge = 0.97f;
+
                 InternalChildren = new Drawable[]
                 {
                     new Container
                     {
-                        Height = circle_size,
-                        RelativeSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = fudge,
                         Masking = true,
                         AlwaysPresent = true,
                         EdgeEffect = effect,
@@ -394,8 +420,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     },
                     new Box
                     {
-                        Height = circle_size,
-                        RelativeSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = fudge,
                     },
                 };
             }