From cd90d2931534bf8210fedfc6a4c2efbb5863d05a Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Wed, 25 May 2022 12:37:28 +0100
Subject: [PATCH] Ensure channel traversal shortcut scrolls channel list item
 into view

---
 osu.Game/Overlays/Chat/ChannelList/ChannelList.cs | 5 ++++-
 osu.Game/Overlays/ChatOverlayV2.cs                | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
index f212f5b162..2798841925 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
 
         private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
 
+        private OsuScrollContainer scroll = null!;
         private ChannelListItemFlow publicChannelFlow = null!;
         private ChannelListItemFlow privateChannelFlow = null!;
         private ChannelListItem selector = null!;
@@ -43,7 +44,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background6,
                 },
-                new OsuScrollContainer
+                scroll = new OsuScrollContainer
                 {
                     Padding = new MarginPadding { Vertical = 7 },
                     RelativeSizeAxes = Axes.Both,
@@ -104,6 +105,8 @@ namespace osu.Game.Overlays.Chat.ChannelList
             return channelMap[channel];
         }
 
+        public void ScrollChannelIntoView(Channel channel) => scroll.ScrollIntoView(this.GetItem(channel));
+
         private ChannelListItemFlow getFlowForChannel(Channel channel)
         {
             switch (channel.Type)
diff --git a/osu.Game/Overlays/ChatOverlayV2.cs b/osu.Game/Overlays/ChatOverlayV2.cs
index cc780073ce..ad7a856dbc 100644
--- a/osu.Game/Overlays/ChatOverlayV2.cs
+++ b/osu.Game/Overlays/ChatOverlayV2.cs
@@ -397,6 +397,8 @@ namespace osu.Game.Overlays
             int currentIndex = overlayChannels.IndexOf(currentChannel.Value);
 
             currentChannel.Value = overlayChannels[(currentIndex + direction + overlayChannels.Count) % overlayChannels.Count];
+
+            channelList.ScrollChannelIntoView(currentChannel.Value);
         }
 
         private IEnumerable<Channel> filterToChatChannels(IEnumerable channels)