sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated colour definitions

Browse Source
This commit is contained in:
Salman Ahmed 2021-07-12 17:55:29 +03:00
parent 1deaefacb7
commit 9869986c59
4 changed files with 6 additions and 9 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,6 +3,7 @@
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Overlays;
using osuTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Beatmaps.ControlPoints namespace osu.Game.Beatmaps.ControlPoints
@ -25,7 +26,7 @@ namespace osu.Game.Beatmaps.ControlPoints
MaxValue = 10 MaxValue = 10
}; };
public override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1; public override Color4 GetRepresentingColour(OsuColour colours) => OverlayColourProvider.Lime.Colour1;
/// <summary> /// <summary>
/// The speed multiplier at this control point. /// The speed multiplier at this control point.

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

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

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

@ -198,10 +198,6 @@ namespace osu.Game.Graphics
public readonly Color4 GrayE = Color4Extensions.FromHex(@"eee"); public readonly Color4 GrayE = Color4Extensions.FromHex(@"eee");
public readonly Color4 GrayF = Color4Extensions.FromHex(@"fff"); 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 // Content Background
public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28"); public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");

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

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