h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 18:42:56 +08:00
Code Issues Releases Wiki Activity

Rename method to remove "InitialColour" namings

Browse Source
This commit is contained in:
smoogipoo 2020-08-22 00:56:29 +09:00
parent 356c67f00d
commit 08078b9513
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
View File

@ -58,14 +58,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(backgroundColour), new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(backgroundColour),
new Container new Container
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = leftLineWidth, Width = leftLineWidth,
Scale = new Vector2(0.740f, 1), Scale = new Vector2(0.740f, 1),
Alpha = hasLeftLine ? 1 : 0, Alpha = hasLeftLine ? 1 : 0,
Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour) Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
}, },
new Container new Container
{ {
@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
Width = rightLineWidth, Width = rightLineWidth,
Scale = new Vector2(0.740f, 1), Scale = new Vector2(0.740f, 1),
Alpha = hasRightLine ? 1 : 0, Alpha = hasRightLine ? 1 : 0,
Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour) Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
}, },
lightContainer = new Container lightContainer = new Container
{ {

2
osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
Texture = skin.GetTexture("sliderb-nd"), Texture = skin.GetTexture("sliderb-nd"),
Colour = new Color4(5, 5, 5, 255), Colour = new Color4(5, 5, 5, 255),
}, },
animationContent.WithInitialColour(ballColour).With(d => animationContent.WithLegacyColour(ballColour).With(d =>
{ {
d.Anchor = Anchor.Centre; d.Anchor = Anchor.Centre;
d.Origin = Anchor.Centre; d.Origin = Anchor.Centre;

4
osu.Game/Skinning/LegacySkinExtensions.cs
View File

@ -82,10 +82,10 @@ namespace osu.Game.Skinning
/// <remarks> /// <remarks>
/// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten. /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
/// </remarks> /// </remarks>
/// <param name="drawable">The <see cref="Drawable"/> to set the "InitialColour" of.</param> /// <param name="drawable">The <see cref="Drawable"/> to set the colour of.</param>
/// <param name="colour">The <see cref="Color4"/> to set.</param> /// <param name="colour">The <see cref="Color4"/> to set.</param>
/// <returns>The given <see cref="Drawable"/>.</returns> /// <returns>The given <see cref="Drawable"/>.</returns>
public static T WithInitialColour<T>(this T drawable, Color4 colour) public static T WithLegacyColour<T>(this T drawable, Color4 colour)
where T : Drawable where T : Drawable
{ {
drawable.Alpha = colour.A; drawable.Alpha = colour.A;