h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-16 05:37:19 +08:00
Code Issues Releases Wiki Activity

Revert "Remove duplicated colour definitions"

Browse Source 
This reverts commit 9869986c59482f4c64b718e1bceb17d0ebc5d9aa.
This commit is contained in:
Salman Ahmed 2021-07-14 03:18:13 +03:00
parent 9869986c59
commit b4961cd12e
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
View File

@ -3,7 +3,6 @@
using osu.Framework.Bindables;
using osu.Game.Graphics;
using osu.Game.Overlays;
using osuTK.Graphics;
namespace osu.Game.Beatmaps.ControlPoints
@ -26,7 +25,7 @@ namespace osu.Game.Beatmaps.ControlPoints
MaxValue = 10
};
public override Color4 GetRepresentingColour(OsuColour colours) => OverlayColourProvider.Lime.Colour1;
public override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
/// <summary>
/// The speed multiplier at this control point.

3
osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Bindables;
using osu.Game.Beatmaps.Timing;
using osu.Game.Graphics;
using osu.Game.Overlays;
using osuTK.Graphics;
namespace osu.Game.Beatmaps.ControlPoints
@ -21,7 +20,7 @@ namespace osu.Game.Beatmaps.ControlPoints
/// </summary>
private const double default_beat_length = 60000.0 / 60.0;
public override Color4 GetRepresentingColour(OsuColour colours) => OverlayColourProvider.Orange.Colour1;
public override Color4 GetRepresentingColour(OsuColour colours) => colours.Orange1;
public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
{

4
osu.Game/Graphics/OsuColour.cs
View File

@ -198,6 +198,10 @@ namespace osu.Game.Graphics
public readonly Color4 GrayE = Color4Extensions.FromHex(@"eee");
public readonly Color4 GrayF = Color4Extensions.FromHex(@"fff");
// in latest editor design logic, need to figure out where these sit...
public readonly Color4 Lime1 = Color4Extensions.FromHex(@"b2ff66");
public readonly Color4 Orange1 = Color4Extensions.FromHex(@"ffd966");
// Content Background
public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");

5
osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Containers.Markdown;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Wiki.Markdown
{
@ -65,7 +66,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
public string Text { get; set; }
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
private void load(OverlayColourProvider colourProvider, OsuColour colour)
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
@ -80,7 +81,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
},
textFlow = parentFlowComponent.CreateTextFlow().With(t =>
{
t.Colour = OverlayColourProvider.Orange.Colour1;
t.Colour = colour.Orange1;
t.Padding = new MarginPadding
{
Vertical = 10,