diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index 826da17ca8..d7af47a835 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -53,15 +53,15 @@ namespace osu.Game.Tests.Visual.UserInterface
component.Colours.AddRange(new[]
{
- Color4.DarkRed,
- Color4.Aquamarine,
- Color4.Goldenrod,
- Color4.Gainsboro
+ Colour4.DarkRed,
+ Colour4.Aquamarine,
+ Colour4.Goldenrod,
+ Colour4.Gainsboro
});
});
}
- private Color4 randomColour() => new Color4(
+ private Colour4 randomColour() => new Color4(
RNG.NextSingle(),
RNG.NextSingle(),
RNG.NextSingle(),
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index 01d91f7cfd..dfdc76687f 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -3,7 +3,6 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@@ -11,22 +10,21 @@ using osu.Framework.Graphics.UserInterface;
using osu.Framework.Localisation;
using osu.Game.Graphics.Sprites;
using osuTK;
-using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterfaceV2
{
///
/// A component which displays a colour along with related description text.
///
- public class ColourDisplay : CompositeDrawable, IHasCurrentValue
+ public class ColourDisplay : CompositeDrawable, IHasCurrentValue
{
- private readonly BindableWithCurrent current = new BindableWithCurrent();
+ private readonly BindableWithCurrent current = new BindableWithCurrent();
private Box fill;
private OsuSpriteText colourHexCode;
private OsuSpriteText colourName;
- public Bindable Current
+ public Bindable Current
{
get => current.Current;
set => current.Current = value;
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index ba950048dc..a32257ef79 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osuTK;
-using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterfaceV2
{
@@ -17,7 +16,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
///
public class ColourPalette : CompositeDrawable
{
- public BindableList Colours { get; } = new BindableList();
+ public BindableList Colours { get; } = new BindableList();
private string colourNamePrefix = "Colour";
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
index 58443953bc..8970ef1115 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
@@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables;
-using osuTK.Graphics;
+using osu.Framework.Graphics;
namespace osu.Game.Graphics.UserInterfaceV2
{
@@ -13,7 +13,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
{
}
- public BindableList Colours => Component.Colours;
+ public BindableList Colours => Component.Colours;
public string ColourNamePrefix
{
diff --git a/osu.Game/Screens/Edit/Setup/ColoursSection.cs b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
index 4a81959a54..d7e16645f2 100644
--- a/osu.Game/Screens/Edit/Setup/ColoursSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
+using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Localisation;
@@ -32,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
var colours = Beatmap.BeatmapSkin?.GetConfig>(GlobalSkinColours.ComboColours)?.Value;
if (colours != null)
- comboColours.Colours.AddRange(colours);
+ comboColours.Colours.AddRange(colours.Select(c => (Colour4)c));
}
}
}