sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into infrastructure

Browse Source
This commit is contained in:
Dan Balasescu
2019-11-08 19:10:49 +09:00
committed by GitHub
parent ff3db9f3b2 5f122d88b9
commit 1c1a49011b
111 changed files with 3246 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Drawings.Components;
@ -24,7 +23,7 @@ using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Drawings
{
public class DrawingsScreen : CompositeDrawable
public class DrawingsScreen : TournamentScreen
{
private const string results_filename = "drawings_results.txt";
@ -128,21 +127,21 @@ namespace osu.Game.Tournament.Screens.Drawings
// Control panel container
new ControlPanel
{
new OsuButton
new TourneyButton
{
RelativeSizeAxes = Axes.X,
Text = "Begin random",
Action = teamsContainer.StartScrolling,
},
new OsuButton
new TourneyButton
{
RelativeSizeAxes = Axes.X,
Text = "Stop random",
Action = teamsContainer.StopScrolling,
},
new OsuButton
new TourneyButton
{
RelativeSizeAxes = Axes.X,
@ -150,7 +149,7 @@ namespace osu.Game.Tournament.Screens.Drawings
Action = reloadTeams
},
new ControlPanel.Spacer(),
new OsuButton
new TourneyButton
{
RelativeSizeAxes = Axes.X,