From b712b195399485038a950f79deda980088e4dc9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:08:09 +0900
Subject: [PATCH] Update all tournament buttons to use new design

---
 .../Screens/Editors/TeamEditorScreen.cs               |  4 ----
 .../Screens/Editors/TournamentEditorScreen.cs         |  6 +++---
 osu.Game.Tournament/TournamentSceneManager.cs         |  3 +--
 osu.Game.Tournament/TourneyButton.cs                  | 11 +++++++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 6684ccd24b..a8afcece37 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -13,12 +13,8 @@
 using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
-using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
-using osu.Game.Tournament.Screens.Gameplay.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
-using osu.Game.Tournament.Screens.TeamIntro;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 8d221b1818..8a90777300 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -13,7 +13,6 @@
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osuTK;
 
@@ -42,7 +41,7 @@ protected TournamentEditorScreen(TournamentScreen? parentScreen = null)
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             AddRangeInternal(new Drawable[]
             {
@@ -75,9 +74,10 @@ private void load()
                             Text = "Add new",
                             Action = () => Storage.Add(new TModel())
                         },
-                        new DangerousSettingsButton
+                        new TourneyButton
                         {
                             RelativeSizeAxes = Axes.X,
+                            BackgroundColour = colours.Pink3,
                             Text = "Clear all",
                             Action = Storage.Clear
                         },
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index abfe69b97b..216743e4a2 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -252,14 +252,13 @@ public ScreenButton(Type type, Key? shortcutKey = null)
 
                 if (shortcutKey != null)
                 {
-                    Add(new Container
+                    Add(new CircularContainer
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         Size = new Vector2(24),
                         Margin = new MarginPadding(5),
                         Masking = true,
-                        CornerRadius = 4,
                         Alpha = 0.5f,
                         Blending = BlendingParameters.Additive,
                         Children = new Drawable[]
diff --git a/osu.Game.Tournament/TourneyButton.cs b/osu.Game.Tournament/TourneyButton.cs
index 67426c1d58..b874c5c37c 100644
--- a/osu.Game.Tournament/TourneyButton.cs
+++ b/osu.Game.Tournament/TourneyButton.cs
@@ -1,18 +1,21 @@
 // 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.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Tournament
 {
-    public partial class TourneyButton : OsuButton
+    public partial class TourneyButton : SettingsButton
     {
         public new Box Background => base.Background;
 
-        public TourneyButton()
-            : base(null)
+        [BackgroundDependencyLoader]
+        private void load()
         {
+            Padding = new MarginPadding();
         }
     }
 }