From 3dd6589d6e2d516ec5790ce06c24bb5d98447b31 Mon Sep 17 00:00:00 2001
From: Jess Meng <jessicalmeng@gmail.com>
Date: Sat, 12 Dec 2020 15:53:08 -0800
Subject: [PATCH] Fixed style changes and cleaned up ctrl + t implementation

---
 .../Overlays/Chat/Tabs/ChannelTabControl.cs   |  5 +++++
 osu.Game/Overlays/ChatOverlay.cs              | 19 +++----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index 19c6f437b6..bc68a9f32a 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -96,6 +96,11 @@ namespace osu.Game.Overlays.Chat.Tabs
             selectorTab.Active.Value = false;
         }
 
+        public void SelectChannelSelectorTab() 
+        {
+            SelectTab(selectorTab);
+        }
+
         protected override TabFillFlowContainer CreateTabFlow() => new ChannelTabFillFlowContainer
         {
             Direction = FillDirection.Full,
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 5162b6aab0..7ff63595c7 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -25,9 +25,6 @@ using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 
-using System;
-using osu.Game.Input.Bindings;
-
 namespace osu.Game.Overlays
 {
     public class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
@@ -335,17 +332,6 @@ namespace osu.Game.Overlays
             if (channel != null)
                 ChannelTabControl.Current.Value = channel;
         }
-
-        private void selectChannelSelectorTab()
-        {
-            int i = 0;
-            var channel = ChannelTabControl.Items
-                                           .Where(tab => (tab is ChannelSelectorTabItem.ChannelSelectorTabChannel))
-                                           .ElementAtOrDefault(i);
-            if (channel != null)
-                ChannelTabControl.Current.Value = channel;
-        }
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.AltPressed)
@@ -369,6 +355,7 @@ namespace osu.Game.Overlays
                         return true;
                 }
             }
+
             if (e.ControlPressed)
             {
                 switch (e.Key)
@@ -376,8 +363,9 @@ namespace osu.Game.Overlays
                     case Key.W:
                         channelManager.LeaveChannel(channelManager.CurrentChannel.Value);
                         return true;
+
                     case Key.T:
-                        selectChannelSelectorTab();
+                        ChannelTabControl.SelectChannelSelectorTab();
                         return true;
                 }
             }
@@ -417,7 +405,6 @@ namespace osu.Game.Overlays
 
         private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventArgs args)
         {
-
             switch (args.Action)
             {
                 case NotifyCollectionChangedAction.Add: