sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename dummy channel and move to a nested class inside the ChannelListing itself

Browse Source
This commit is contained in:
Dean Herbert
2022-05-19 19:26:14 +09:00
parent 63c9776365
commit 136ecb45e2
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat.Listing;
namespace osu.Game.Overlays.Chat.ChannelList
{
@ -23,7 +24,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
private readonly DummySelectorChannel dummySelectorChannel = new DummySelectorChannel();
private readonly ChannelListing.ChannelListingChannel channelListingChannel = new ChannelListing.ChannelListingChannel();
private ChannelListItemFlow publicChannelFlow = null!;
private ChannelListItemFlow privateChannelFlow = null!;
@ -53,7 +54,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
Children = new Drawable[]
{
publicChannelFlow = new ChannelListItemFlow("CHANNELS"),
selector = new ChannelListItem(dummySelectorChannel)
selector = new ChannelListItem(channelListingChannel)
{
Margin = new MarginPadding { Bottom = 10 },
},

3
osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat.Listing;
using osu.Game.Users.Drawables;
using osuTK;
@ -191,6 +192,6 @@ namespace osu.Game.Overlays.Chat.ChannelList
text.FadeColour(colourProvider.Light3, 200, Easing.OutQuint);
}
private bool isSelector => Channel is DummySelectorChannel;
private bool isSelector => Channel is ChannelListing.ChannelListingChannel;
}
}

9
osu.Game/Overlays/Chat/Listing/ChannelListing.cs
View File

@ -75,5 +75,14 @@ namespace osu.Game.Overlays.Chat.Listing
protected override void PopIn() => this.FadeIn();
protected override void PopOut() => this.FadeOut();
public class ChannelListingChannel : Channel
{
public ChannelListingChannel()
{
Name = "Add more channels";
Type = ChannelType.System;
}
}
}
}