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

Use OsuButton everywhere

Browse Source
This commit is contained in:
Dean Herbert 2019-06-18 17:17:46 +09:00
parent 437ad2b0d0
commit 711214ed09
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
View File

@ -128,21 +128,21 @@ namespace osu.Game.Tournament.Screens.Drawings
// Control panel container // Control panel container
new ControlPanel new ControlPanel
{ {
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Begin random", Text = "Begin random",
Action = teamsContainer.StartScrolling, Action = teamsContainer.StartScrolling,
}, },
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Stop random", Text = "Stop random",
Action = teamsContainer.StopScrolling, Action = teamsContainer.StopScrolling,
}, },
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -150,7 +150,7 @@ namespace osu.Game.Tournament.Screens.Drawings
Action = reloadTeams Action = reloadTeams
}, },
new ControlPanel.Spacer(), new ControlPanel.Spacer(),
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,

2
osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Tournament.Screens.Editors
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Add new", Text = "Add new",

6
osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>(); private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
public readonly Bindable<TourneyState> State = new Bindable<TourneyState>(); public readonly Bindable<TourneyState> State = new Bindable<TourneyState>();
private TriangleButton warmupButton; private OsuButton warmupButton;
private MatchIPCInfo ipc; private MatchIPCInfo ipc;
private readonly Color4 red = new Color4(186, 0, 18, 255); private readonly Color4 red = new Color4(186, 0, 18, 255);
@ -103,13 +103,13 @@ namespace osu.Game.Tournament.Screens.Gameplay
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
warmupButton = new TriangleButton warmupButton = new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Toggle warmup", Text = "Toggle warmup",
Action = () => warmup.Toggle() Action = () => warmup.Toggle()
}, },
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Toggle chat", Text = "Toggle chat",

18
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -34,10 +34,10 @@ namespace osu.Game.Tournament.Screens.MapPool
private TeamColour pickColour; private TeamColour pickColour;
private ChoiceType pickType; private ChoiceType pickType;
private readonly TriangleButton buttonRedBan; private readonly OsuButton buttonRedBan;
private readonly TriangleButton buttonBlueBan; private readonly OsuButton buttonBlueBan;
private readonly TriangleButton buttonRedPick; private readonly OsuButton buttonRedPick;
private readonly TriangleButton buttonBluePick; private readonly OsuButton buttonBluePick;
public MapPoolScreen() public MapPoolScreen()
{ {
@ -60,32 +60,32 @@ namespace osu.Game.Tournament.Screens.MapPool
{ {
Text = "Current Mode" Text = "Current Mode"
}, },
buttonRedBan = new TriangleButton buttonRedBan = new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Red Ban", Text = "Red Ban",
Action = () => setMode(TeamColour.Red, ChoiceType.Ban) Action = () => setMode(TeamColour.Red, ChoiceType.Ban)
}, },
buttonBlueBan = new TriangleButton buttonBlueBan = new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Blue Ban", Text = "Blue Ban",
Action = () => setMode(TeamColour.Blue, ChoiceType.Ban) Action = () => setMode(TeamColour.Blue, ChoiceType.Ban)
}, },
buttonRedPick = new TriangleButton buttonRedPick = new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Red Pick", Text = "Red Pick",
Action = () => setMode(TeamColour.Red, ChoiceType.Pick) Action = () => setMode(TeamColour.Red, ChoiceType.Pick)
}, },
buttonBluePick = new TriangleButton buttonBluePick = new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Blue Pick", Text = "Blue Pick",
Action = () => setMode(TeamColour.Blue, ChoiceType.Pick) Action = () => setMode(TeamColour.Blue, ChoiceType.Pick)
}, },
new ControlPanel.Spacer(), new ControlPanel.Spacer(),
new TriangleButton new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Reset", Text = "Reset",