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

Remove local specifications of triangle colouring

Browse Source
This commit is contained in:
Dean Herbert 2022-11-24 15:18:26 +09:00
parent 4fbca4037c
commit bea2acc60e
9 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs
View File

@ -13,8 +13,6 @@ namespace osu.Game.Graphics.UserInterface
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.PinkDark; BackgroundColour = colours.PinkDark;
Triangles.ColourDark = colours.PinkDarker;
Triangles.ColourLight = colours.Pink;
} }
} }
} }

5
osu.Game/Overlays/BeatmapSet/Buttons/HeaderButton.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -22,9 +20,6 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
private void load() private void load()
{ {
BackgroundColour = Color4Extensions.FromHex(@"094c5f"); BackgroundColour = Color4Extensions.FromHex(@"094c5f");
Triangles.ColourLight = Color4Extensions.FromHex(@"0f7c9b");
Triangles.ColourDark = Color4Extensions.FromHex(@"094c5f");
Triangles.TriangleScale = 1.5f;
} }
} }
} }

1
osu.Game/Screens/OnlinePlay/Match/Components/CreateRoomButton.cs
View File

@ -16,7 +16,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
private void load() private void load()
{ {
SpriteText.Font = SpriteText.Font.With(size: 14); SpriteText.Font = SpriteText.Font.With(size: 14);
Triangles.TriangleScale = 1.5f;
} }
public bool OnPressed(KeyBindingPressEvent<PlatformAction> e) public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)

2
osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
View File

@ -15,8 +15,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
private void load() private void load()
{ {
BackgroundColour = Color4Extensions.FromHex(@"593790"); BackgroundColour = Color4Extensions.FromHex(@"593790");
Triangles.ColourLight = Color4Extensions.FromHex(@"7247b6");
Triangles.ColourDark = Color4Extensions.FromHex(@"593790");
} }
} }
} }

2
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
View File

@ -475,8 +475,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Yellow; BackgroundColour = colours.Yellow;
Triangles.ColourLight = colours.YellowLight;
Triangles.ColourDark = colours.YellowDark;
} }
} }

7
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
View File

@ -12,7 +12,6 @@ using osu.Framework.Audio.Sample;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Screens.OnlinePlay.Components; using osu.Game.Screens.OnlinePlay.Components;
@ -20,8 +19,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
{ {
public class MultiplayerReadyButton : ReadyButton public class MultiplayerReadyButton : ReadyButton
{ {
public new Triangles Triangles => base.Triangles;
[Resolved] [Resolved]
private MultiplayerClient multiplayerClient { get; set; } private MultiplayerClient multiplayerClient { get; set; }
@ -212,15 +209,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
void setYellow() void setYellow()
{ {
BackgroundColour = colours.YellowDark; BackgroundColour = colours.YellowDark;
Triangles.ColourDark = colours.YellowDark;
Triangles.ColourLight = colours.Yellow;
} }
void setGreen() void setGreen()
{ {
BackgroundColour = colours.Green; BackgroundColour = colours.Green;
Triangles.ColourDark = colours.Green;
Triangles.ColourLight = colours.GreenLight;
} }
} }

14
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osuTK; using osuTK;
@ -24,11 +23,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
private IBindable<bool> operationInProgress; private IBindable<bool> operationInProgress;
private readonly ButtonWithTrianglesExposed button; private readonly TriangleButton button;
public MultiplayerSpectateButton() public MultiplayerSpectateButton()
{ {
InternalChild = button = new ButtonWithTrianglesExposed InternalChild = button = new TriangleButton
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = Vector2.One, Size = Vector2.One,
@ -67,15 +66,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
default: default:
button.Text = "Spectate"; button.Text = "Spectate";
button.BackgroundColour = colours.BlueDark; button.BackgroundColour = colours.BlueDark;
button.Triangles.ColourDark = colours.BlueDarker;
button.Triangles.ColourLight = colours.Blue;
break; break;
case MultiplayerUserState.Spectating: case MultiplayerUserState.Spectating:
button.Text = "Stop spectating"; button.Text = "Stop spectating";
button.BackgroundColour = colours.Gray4; button.BackgroundColour = colours.Gray4;
button.Triangles.ColourDark = colours.Gray5;
button.Triangles.ColourLight = colours.Gray6;
break; break;
} }
@ -83,10 +78,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
&& Client.Room.State != MultiplayerRoomState.Closed && Client.Room.State != MultiplayerRoomState.Closed
&& !operationInProgress.Value; && !operationInProgress.Value;
} }
private class ButtonWithTrianglesExposed : TriangleButton
{
public new Triangles Triangles => base.Triangles;
}
} }
} }

2
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
View File

@ -38,8 +38,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Green; BackgroundColour = colours.Green;
Triangles.ColourDark = colours.Green;
Triangles.ColourLight = colours.GreenLight;
} }
private bool hasRemainingAttempts = true; private bool hasRemainingAttempts = true;

2
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
View File

@ -425,8 +425,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Yellow; BackgroundColour = colours.Yellow;
Triangles.ColourLight = colours.YellowLight;
Triangles.ColourDark = colours.YellowDark;
} }
} }