RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use OsuButton everywhere

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 @@ private void load(TextureStore textures, Storage storage)
// Control panel container
new ControlPanel
{
new TriangleButton
new OsuButton
{
RelativeSizeAxes = Axes.X,
Text = "Begin random",
Action = teamsContainer.StartScrolling,
},
new TriangleButton
new OsuButton
{
RelativeSizeAxes = Axes.X,
Text = "Stop random",
Action = teamsContainer.StopScrolling,
},
new TriangleButton
new OsuButton
{
RelativeSizeAxes = Axes.X,
@ -150,7 +150,7 @@ private void load(TextureStore textures, Storage storage)
Action = reloadTeams
},
new ControlPanel.Spacer(),
new TriangleButton
new OsuButton
{
RelativeSizeAxes = Axes.X,

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

@ -46,7 +46,7 @@ protected TournamentEditorScreen()
{
Children = new Drawable[]
{
new TriangleButton
new OsuButton
{
RelativeSizeAxes = Axes.X,
Text = "Add new",

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

@ -26,7 +26,7 @@ public class GameplayScreen : BeatmapInfoScreen
private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
public readonly Bindable<TourneyState> State = new Bindable<TourneyState>();
private TriangleButton warmupButton;
private OsuButton warmupButton;
private MatchIPCInfo ipc;
private readonly Color4 red = new Color4(186, 0, 18, 255);
@ -103,13 +103,13 @@ private void load(LadderInfo ladder, MatchIPCInfo ipc)
{
Children = new Drawable[]
{
warmupButton = new TriangleButton
warmupButton = new OsuButton
{
RelativeSizeAxes = Axes.X,
Text = "Toggle warmup",
Action = () => warmup.Toggle()
},
new TriangleButton
new OsuButton
{
RelativeSizeAxes = Axes.X,
Text = "Toggle chat",

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

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