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

Rename Colour to AccentColour

Browse Source
This commit is contained in:
Daniel Cios 2024-09-20 16:38:26 +02:00
parent 1a48b46536
commit ec575e9de4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Screens.Play.HUD
public Bindable<bool> ShowTime { get; } = new BindableBool(true); public Bindable<bool> ShowTime { get; } = new BindableBool(true);
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))] [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
public new BindableColour4 Colour { get; } = new BindableColour4(Colour4.White); public BindableColour4 AccentColour { get; } = new BindableColour4(Colour4.White);
[Resolved] [Resolved]
private Player? player { get; set; } private Player? player { get; set; }
@ -118,7 +118,7 @@ namespace osu.Game.Screens.Play.HUD
base.Update(); base.Update();
content.Height = bar.Height + bar_height + info.Height; content.Height = bar.Height + bar_height + info.Height;
graphContainer.Height = bar.Height; graphContainer.Height = bar.Height;
base.Colour = Colour.Value; Colour = AccentColour.Value;
} }
protected override void UpdateProgress(double progress, bool isIntro) protected override void UpdateProgress(double progress, bool isIntro)

6
osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play.HUD
public BindableBool InvertShear { get; } = new BindableBool(); public BindableBool InvertShear { get; } = new BindableBool();
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))] [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
public new BindableColour4 Colour { get; } = new BindableColour4(Color4Extensions.FromHex("#66CCFF")); public BindableColour4 AccentColour { get; } = new BindableColour4(Color4Extensions.FromHex("#66CCFF"));
public ArgonWedgePiece() public ArgonWedgePiece()
{ {
@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.HUD
InternalChild = new Box InternalChild = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = ColourInfo.GradientVertical(Colour.Value.Opacity(0.0f), Colour.Value.Opacity(0.25f)), Colour = ColourInfo.GradientVertical(AccentColour.Value.Opacity(0.0f), AccentColour.Value.Opacity(0.25f)),
}; };
} }
@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.HUD
base.LoadComplete(); base.LoadComplete();
InvertShear.BindValueChanged(v => Shear = new Vector2(0.8f, 0f) * (v.NewValue ? -1 : 1), true); InvertShear.BindValueChanged(v => Shear = new Vector2(0.8f, 0f) * (v.NewValue ? -1 : 1), true);
Colour.BindValueChanged(c => InternalChild.Colour = ColourInfo.GradientVertical(Colour.Value.Opacity(0.0f), Colour.Value.Opacity(0.25f))); AccentColour.BindValueChanged(c => InternalChild.Colour = ColourInfo.GradientVertical(AccentColour.Value.Opacity(0.0f), AccentColour.Value.Opacity(0.25f)));
} }
} }
} }

4
osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play.HUD
public Bindable<bool> ShowTime { get; } = new BindableBool(true); public Bindable<bool> ShowTime { get; } = new BindableBool(true);
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))] [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
public new BindableColour4 Colour { get; } = new BindableColour4(Colour4.White); public BindableColour4 AccentColour { get; } = new BindableColour4(Colour4.White);
[Resolved] [Resolved]
private Player? player { get; set; } private Player? player { get; set; }
@ -119,7 +119,7 @@ namespace osu.Game.Screens.Play.HUD
if (!Precision.AlmostEquals(Height, newHeight, 5f)) if (!Precision.AlmostEquals(Height, newHeight, 5f))
content.Height = newHeight; content.Height = newHeight;
base.Colour = Colour.Value; Colour = AccentColour.Value;
} }
private void updateBarVisibility() private void updateBarVisibility()

4
osu.Game/Skinning/Components/BoxElement.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Skinning.Components
}; };
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))] [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
public new BindableColour4 Colour { get; } = new BindableColour4(Colour4.White); public BindableColour4 AccentColour { get; } = new BindableColour4(Colour4.White);
public BoxElement() public BoxElement()
{ {
@ -51,7 +51,7 @@ namespace osu.Game.Skinning.Components
base.Update(); base.Update();
base.CornerRadius = CornerRadius.Value * Math.Min(DrawWidth, DrawHeight); base.CornerRadius = CornerRadius.Value * Math.Min(DrawWidth, DrawHeight);
base.Colour = Colour.Value; Colour = AccentColour.Value;
} }
} }
} }