sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-30 07:38:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Ensure channel traversal shortcut scrolls channel list item into view

Browse Source
This commit is contained in:
Jai Sharma 2022-05-25 12:37:28 +01:00
parent 4a36f3aa4c
commit cd90d29315
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
View File

@ -29,6 +29,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>(); private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
private OsuScrollContainer scroll = null!;
private ChannelListItemFlow publicChannelFlow = null!; private ChannelListItemFlow publicChannelFlow = null!;
private ChannelListItemFlow privateChannelFlow = null!; private ChannelListItemFlow privateChannelFlow = null!;
private ChannelListItem selector = null!; private ChannelListItem selector = null!;
@ -43,7 +44,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background6, Colour = colourProvider.Background6,
}, },
new OsuScrollContainer scroll = new OsuScrollContainer
{ {
Padding = new MarginPadding { Vertical = 7 }, Padding = new MarginPadding { Vertical = 7 },
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -104,6 +105,8 @@ namespace osu.Game.Overlays.Chat.ChannelList
return channelMap[channel]; return channelMap[channel];
} }
public void ScrollChannelIntoView(Channel channel) => scroll.ScrollIntoView(this.GetItem(channel));
private ChannelListItemFlow getFlowForChannel(Channel channel) private ChannelListItemFlow getFlowForChannel(Channel channel)
{ {
switch (channel.Type) switch (channel.Type)

2
osu.Game/Overlays/ChatOverlayV2.cs
View File

@ -397,6 +397,8 @@ namespace osu.Game.Overlays
int currentIndex = overlayChannels.IndexOf(currentChannel.Value); int currentIndex = overlayChannels.IndexOf(currentChannel.Value);
currentChannel.Value = overlayChannels[(currentIndex + direction + overlayChannels.Count) % overlayChannels.Count]; currentChannel.Value = overlayChannels[(currentIndex + direction + overlayChannels.Count) % overlayChannels.Count];
channelList.ScrollChannelIntoView(currentChannel.Value);
} }
private IEnumerable<Channel> filterToChatChannels(IEnumerable channels) private IEnumerable<Channel> filterToChatChannels(IEnumerable channels)