sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make buttons purple

Browse Source
This commit is contained in:
Dean Herbert
2020-02-20 18:43:47 +09:00
parent a0b578082e
commit 4a3f281855
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Multi/Match/Components/Footer.cs
View File

@ -8,7 +8,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osuTK; using osuTK;
@ -22,7 +21,6 @@ namespace osu.Game.Screens.Multi.Match.Components
public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>(); public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
private readonly Drawable background; private readonly Drawable background;
private readonly OsuButton startButton;
public Footer() public Footer()
{ {
@ -32,7 +30,7 @@ namespace osu.Game.Screens.Multi.Match.Components
InternalChildren = new[] InternalChildren = new[]
{ {
background = new Box { RelativeSizeAxes = Axes.Both }, background = new Box { RelativeSizeAxes = Axes.Both },
startButton = new ReadyButton new ReadyButton
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

7
osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
View File

@ -226,7 +226,7 @@ namespace osu.Game.Screens.Multi.Match.Components
}, },
new Drawable[] new Drawable[]
{ {
new OsuButton new PurpleTriangleButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 40, Height = 40,
@ -447,10 +447,7 @@ namespace osu.Game.Screens.Multi.Match.Components
Menu.MaxHeight = 100; Menu.MaxHeight = 100;
} }
protected override string GenerateItemText(TimeSpan item) protected override string GenerateItemText(TimeSpan item) => item.Humanize();
{
return item.Humanize();
}
} }
} }
} }

20
osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs Normal file
View File

@ -0,0 +1,20 @@
// 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.
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Multi.Match.Components
{
public class PurpleTriangleButton : TriangleButton
{
[BackgroundDependencyLoader]
private void load()
{
BackgroundColour = OsuColour.FromHex(@"593790");
Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
Triangles.ColourDark = OsuColour.FromHex(@"593790");
}
}
}

6
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -24,6 +24,7 @@ using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge; using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match; using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osuTK; using osuTK;
@ -375,7 +376,7 @@ namespace osu.Game.Screens.Multi
} }
} }
public class CreateRoomButton : TriangleButton public class CreateRoomButton : PurpleTriangleButton
{ {
public CreateRoomButton() public CreateRoomButton()
{ {
@ -390,9 +391,6 @@ namespace osu.Game.Screens.Multi
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
BackgroundColour = OsuColour.FromHex(@"593790");
Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
Triangles.ColourDark = OsuColour.FromHex(@"593790");
Triangles.TriangleScale = 1.5f; Triangles.TriangleScale = 1.5f;
Text = "Create room"; Text = "Create room";