From 1b6342438f8cc54ff14dad811d54512c7e8af29b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 12:03:33 +0900
Subject: [PATCH] Hide scrollbars in tournament chat display

---
 .../Components/TournamentMatchChatDisplay.cs    | 11 +++++++++++
 osu.Game/Online/Chat/StandAloneChatDisplay.cs   | 17 ++++++++++-------
 osu.Game/Overlays/Chat/DrawableChannel.cs       | 15 +++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 2a183d0d45..fe22d1e76d 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -70,6 +70,17 @@ namespace osu.Game.Tournament.Components
 
         protected override ChatLine CreateMessage(Message message) => new MatchMessage(message);
 
+        protected override StandAloneDrawableChannel CreateDrawableChannel(Channel channel) => new MatchChannel(channel);
+
+        public class MatchChannel : StandAloneDrawableChannel
+        {
+            public MatchChannel(Channel channel)
+                : base(channel)
+            {
+                ScrollbarVisible = false;
+            }
+        }
+
         protected class MatchMessage : StandAloneMessage
         {
             public MatchMessage(Message message)
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index 0914f688e9..4fbeac1db9 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Chat
 
         protected ChannelManager ChannelManager;
 
-        private DrawableChannel drawableChannel;
+        private StandAloneDrawableChannel drawableChannel;
 
         private readonly bool postingTextbox;
 
@@ -77,6 +77,9 @@ namespace osu.Game.Online.Chat
                 ChannelManager = manager;
         }
 
+        protected virtual StandAloneDrawableChannel CreateDrawableChannel(Channel channel) =>
+            new StandAloneDrawableChannel(channel);
+
         private void postMessage(TextBox sender, bool newtext)
         {
             var text = textbox.Text.Trim();
@@ -100,14 +103,14 @@ namespace osu.Game.Online.Chat
 
             if (e.NewValue == null) return;
 
-            AddInternal(drawableChannel = new StandAloneDrawableChannel(e.NewValue)
-            {
-                CreateChatLineAction = CreateMessage,
-                Padding = new MarginPadding { Bottom = postingTextbox ? textbox_height : 0 }
-            });
+            drawableChannel = CreateDrawableChannel(e.NewValue);
+            drawableChannel.CreateChatLineAction = CreateMessage;
+            drawableChannel.Padding = new MarginPadding { Bottom = postingTextbox ? textbox_height : 0 };
+
+            AddInternal(drawableChannel);
         }
 
-        protected class StandAloneDrawableChannel : DrawableChannel
+        public class StandAloneDrawableChannel : DrawableChannel
         {
             public Func<Message, ChatLine> CreateChatLineAction;
 
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 443f2b7bf7..6019657cf0 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -26,6 +26,20 @@ namespace osu.Game.Overlays.Chat
         protected FillFlowContainer ChatLineFlow;
         private OsuScrollContainer scroll;
 
+        private bool scrollbarVisible = true;
+
+        public bool ScrollbarVisible
+        {
+            set
+            {
+                if (scrollbarVisible == value) return;
+
+                scrollbarVisible = value;
+                if (scroll != null)
+                    scroll.ScrollbarVisible = value;
+            }
+        }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -44,6 +58,7 @@ namespace osu.Game.Overlays.Chat
                 Masking = true,
                 Child = scroll = new OsuScrollContainer
                 {
+                    ScrollbarVisible = scrollbarVisible,
                     RelativeSizeAxes = Axes.Both,
                     // Some chat lines have effects that slightly protrude to the bottom,
                     // which we do not want to mask away, hence the padding.