From bd6d3f147316df900655ddc9a0d816ab11ef1f9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Nov 2018 06:47:42 +0900
Subject: [PATCH] Improve appearance

---
 .../Components/TournamentBeatmapPanel.cs      | 20 ++++++++++++--
 .../Screens/MapPool/MapPoolScreen.cs          | 26 ++++++++++++++-----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 7f9494e3c9..b804fc44a7 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -132,19 +132,35 @@ private void updateState()
 
             if (found != null)
             {
+                BorderThickness = 6;
+
                 switch (found.Team)
                 {
                     case TeamColour.Red:
-                        Colour = Color4.Red;
+                        BorderColour = Color4.Red;
                         break;
                     case TeamColour.Blue:
-                        Colour = Color4.Blue;
+                        BorderColour = Color4.Blue;
+                        break;
+                }
+
+                switch (found.Type)
+                {
+                    case ChoiceType.Pick:
+                        Colour = Color4.White;
+                        Alpha = 1;
+                        break;
+                    case ChoiceType.Ban:
+                        Colour = Color4.Gray;
+                        Alpha = 0.5f;
                         break;
                 }
             }
             else
             {
                 Colour = Color4.White;
+                BorderThickness = 0;
+                Alpha = 1;
             }
         }
 
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index fb9bd7b9a5..be56869115 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -15,6 +15,7 @@
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using OpenTK;
+using OpenTK.Graphics;
 using OpenTK.Input;
 
 namespace osu.Game.Tournament.Screens.MapPool
@@ -75,7 +76,14 @@ public MapPoolScreen()
                             RelativeSizeAxes = Axes.X,
                             Text = "Blue Pick",
                             Action = () => setMode(TeamColour.Blue, ChoiceType.Pick)
-                        }
+                        },
+                        new ControlPanel.Spacer(),
+                        new TriangleButton
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Text = "Reset",
+                            Action = reset
+                        },
                     }
                 }
             };
@@ -101,12 +109,12 @@ private void setMode(TeamColour colour, ChoiceType choiceType)
             pickColour = colour;
             pickType = choiceType;
 
-            var enabled = currentMatch.Value.PicksBans.Count == 0;
+            Color4 setColour(bool active) => active ? Color4.White : Color4.Gray;
 
-            buttonRedBan.Enabled.Value = enabled || pickColour == TeamColour.Red && pickType == ChoiceType.Ban;
-            buttonBlueBan.Enabled.Value = enabled || pickColour == TeamColour.Blue && pickType == ChoiceType.Ban;
-            buttonRedPick.Enabled.Value = enabled || pickColour == TeamColour.Red && pickType == ChoiceType.Pick;
-            buttonBluePick.Enabled.Value = enabled || pickColour == TeamColour.Blue && pickType == ChoiceType.Pick;
+            buttonRedBan.Colour = setColour(pickColour == TeamColour.Red && pickType == ChoiceType.Ban);
+            buttonBlueBan.Colour = setColour(pickColour == TeamColour.Blue && pickType == ChoiceType.Ban);
+            buttonRedPick.Colour = setColour(pickColour == TeamColour.Red && pickType == ChoiceType.Pick);
+            buttonBluePick.Colour = setColour(pickColour == TeamColour.Blue && pickType == ChoiceType.Pick);
         }
 
         private void setNextMode()
@@ -141,6 +149,12 @@ protected override bool OnMouseDown(MouseDownEvent e)
             return base.OnMouseDown(e);
         }
 
+        private void reset()
+        {
+            currentMatch.Value.PicksBans.Clear();
+            setNextMode();
+        }
+
         private void addForBeatmap(int beatmapId)
         {
             if (currentMatch.Value.Grouping.Value.Beatmaps.All(b => b.BeatmapInfo.OnlineBeatmapID != beatmapId))