change SRGBColour to Color4 and use IHasAccentColour in some places

This commit is contained in:
Jorolf
2017-04-08 13:31:55 +02:00
parent 841d101be7
commit 5e56e84c4a
2 changed files with 16 additions and 13 deletions

View File

@ -2,8 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using System;
@ -33,11 +33,11 @@ namespace osu.Game.Graphics.UserInterface
}
}
public SRGBColour BackgroundColour
public Color4 BackgroundColour
{
get
{
return background?.Colour ?? default(SRGBColour);
return background?.Colour ?? default(Color4);
}
set
{
@ -51,7 +51,7 @@ namespace osu.Game.Graphics.UserInterface
}
}
public SRGBColour BarColour
public Color4 BarColour
{
get
{