Adjust colour swatch to be more friendly to use osu! side (#6782)

Author: peppy

osu.Framework/Graphics/UserInterface/ColourPicker.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 
@@ -22,16 +23,20 @@ public Bindable<Colour4> Current
             set => current.Current = value;
         }
 
-        private readonly HSVColourPicker hsvColourPicker;
-        private readonly SwatchColourPicker? swatchColourPicker;
-        private readonly HexColourPicker hexColourPicker;
+        private HSVColourPicker hsvColourPicker = null!;
+        private HexColourPicker hexColourPicker = null!;
+        private SwatchColourPicker? swatchColourPicker;
 
         protected ColourPicker()
         {
             Current.Value = Colour4.White;
             AutoSizeAxes = Axes.Y;
             Width = 300;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             hsvColourPicker = CreateHSVColourPicker().With(d =>
             {
                 d.RelativeSizeAxes = Axes.X;
@@ -72,7 +77,7 @@ protected ColourPicker()
         protected abstract HSVColourPicker CreateHSVColourPicker();
 
         /// <summary>
-        /// Creates an optional control that shows clickable colour presets.
+        /// Creates the optional control that shows clickable colour presets.
         /// </summary>
         protected virtual SwatchColourPicker? CreateSwatchColourPicker() => null;
 

osu.Framework/Graphics/UserInterface/SwatchColourPicker.cs

@@ -29,7 +29,7 @@ public Bindable<Colour4> Current
         /// <summary>
         /// The preset colours to display as swatches.
         /// </summary>
-        public BindableList<Colour4> Colours { get; }
+        public BindableList<Colour4> Colours { get; } = new BindableList<Colour4>();
 
         /// <summary>
         /// The background of the control.
@@ -41,10 +41,8 @@ public Bindable<Colour4> Current
         /// </summary>
         protected FillFlowContainer Content { get; }
 
-        protected SwatchColourPicker(BindableList<Colour4>? colours = null)
+        protected SwatchColourPicker()
         {
-            Colours = colours ?? new BindableList<Colour4>();
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;