From da840e3fac164afa7fcd900895d42c38c305f518 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Dec 2024 19:45:18 +0900
Subject: [PATCH 1/2] Change the way "current" points are hinted on timing
 screen

I actually thought things were bugged with the previous display method,
since the hinting was very similar to the hover colour/state.

I've adjusted this to hopefully give users a better idea of what this is
intending to show them.
---
 .../Screens/Edit/Timing/ControlPointTable.cs  | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index fd812cfe2b..56fa251bd3 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 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;
@@ -21,6 +22,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Timing.RowAttributes;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -177,7 +179,7 @@ namespace osu.Game.Screens.Edit.Timing
             private readonly BindableWithCurrent<ControlPointGroup> current = new BindableWithCurrent<ControlPointGroup>();
 
             private Box background = null!;
-            private Box currentIndicator = null!;
+            private Drawable currentIndicator = null!;
 
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; } = null!;
@@ -210,11 +212,26 @@ namespace osu.Game.Screens.Edit.Timing
                         Colour = colourProvider.Background1,
                         Alpha = 0,
                     },
-                    currentIndicator = new Box
+                    currentIndicator = new Container
                     {
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 5,
+                        RelativeSizeAxes = Axes.Both,
                         Alpha = 0,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                Width = 5,
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                Blending = BlendingParameters.Additive,
+                                X = 5,
+                                Width = 150,
+                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.1f), Color4.White.Opacity(0))
+                            },
+                        }
                     },
                     new Container
                     {
@@ -281,14 +298,8 @@ namespace osu.Game.Screens.Edit.Timing
                 bool hasCurrentTimingPoint = activeTimingPoint.Value != null && current.Value.ControlPoints.Contains(activeTimingPoint.Value);
                 bool hasCurrentEffectPoint = activeEffectPoint.Value != null && current.Value.ControlPoints.Contains(activeEffectPoint.Value);
 
-                if (IsHovered || isSelected)
-                    background.FadeIn(100, Easing.OutQuint);
-                else if (hasCurrentTimingPoint || hasCurrentEffectPoint)
-                    background.FadeTo(0.2f, 100, Easing.OutQuint);
-                else
-                    background.FadeOut(100, Easing.OutQuint);
-
-                background.Colour = isSelected ? colourProvider.Colour3 : colourProvider.Background1;
+                background.FadeTo(IsHovered || isSelected ? 1 : 0, 100, Easing.OutQuint);
+                background.FadeColour(isSelected ? colourProvider.Colour3 : colourProvider.Background1, 100, Easing.OutQuint);
 
                 if (hasCurrentTimingPoint || hasCurrentEffectPoint)
                 {

From 1058abb4ab63cdc0878f436d4414206535fce868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Dec 2024 12:22:06 +0900
Subject: [PATCH 2/2] Fix code quality

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 56fa251bd3..a37674b104 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 RelativeSizeAxes = Axes.Both;
 
-                InternalChildren = new Drawable[]
+                InternalChildren = new[]
                 {
                     background = new Box
                     {