From ff2777a3b941e7d7efc4fdc2298739342762f515 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2024 18:43:39 +0900
Subject: [PATCH] When adding a new combo colour, use the last colour as a
 starting point

Also opens the popover automatically because you always want to edit it.
---
 .../Graphics/UserInterfaceV2/FormColourPalette.cs  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/FormColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/FormColourPalette.cs
index 9575ebaa3b..fad58841e3 100644
--- a/osu.Game/Graphics/UserInterfaceV2/FormColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/FormColourPalette.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Specialized;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -19,6 +20,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
@@ -76,7 +78,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                             Spacing = new Vector2(5),
                             Child = button = new RoundedButton
                             {
-                                Action = () => Colours.Add(Colour4.White),
+                                Action = addNewColour,
                                 Size = new Vector2(70),
                                 Text = "+",
                             }
@@ -112,6 +114,16 @@ namespace osu.Game.Graphics.UserInterfaceV2
             updateState();
         }
 
+        private void addNewColour()
+        {
+            Color4 startingColour = Colours.Count > 0
+                ? Colours.Last()
+                : Colour4.White;
+
+            Colours.Add(startingColour);
+            flow.OfType<ColourButton>().Last().TriggerClick();
+        }
+
         private void updateState()
         {
             background.Colour = colourProvider.Background5;