h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:43:04 +08:00
Code Issues Releases Wiki Activity

Use null for empty grid cells in ChannelListItem

Browse Source
This commit is contained in:
Jai Sharma 2022-05-17 18:52:19 +01:00
parent ae5b6c3e10
commit 932442e242
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private Box hoverBox = null!; private Box hoverBox = null!;
private Box selectBox = null!; private Box selectBox = null!;
private OsuSpriteText text = null!; private OsuSpriteText text = null!;
private Drawable close = null!; private Drawable? close;
[Resolved] [Resolved]
private Bindable<Channel> selectedChannel { get; set; } = null!; private Bindable<Channel> selectedChannel { get; set; } = null!;
@ -119,9 +119,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
hoverBox.FadeIn(300, Easing.OutQuint); hoverBox.FadeIn(300, Easing.OutQuint);
close?.FadeIn(300, Easing.OutQuint);
if (!isSelector)
close.FadeIn(300, Easing.OutQuint);
return base.OnHover(e); return base.OnHover(e);
} }
@ -129,17 +127,15 @@ namespace osu.Game.Overlays.Chat.ChannelList
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
hoverBox.FadeOut(200, Easing.OutQuint); hoverBox.FadeOut(200, Easing.OutQuint);
close?.FadeOut(200, Easing.OutQuint);
if (!isSelector)
close.FadeOut(200, Easing.OutQuint);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
private Drawable createIcon() private UpdateableAvatar? createIcon()
{ {
if (Channel.Type != ChannelType.PM) if (Channel.Type != ChannelType.PM)
return Drawable.Empty(); return null;
return new UpdateableAvatar(Channel.Users.First(), isInteractive: false) return new UpdateableAvatar(Channel.Users.First(), isInteractive: false)
{ {
@ -152,10 +148,10 @@ namespace osu.Game.Overlays.Chat.ChannelList
}; };
} }
private Drawable createMentionPill() private ChannelListItemMentionPill? createMentionPill()
{ {
if (isSelector) if (isSelector)
return Drawable.Empty(); return null;
return new ChannelListItemMentionPill return new ChannelListItemMentionPill
{ {
@ -166,10 +162,10 @@ namespace osu.Game.Overlays.Chat.ChannelList
}; };
} }
private Drawable createCloseButton() private ChannelListItemCloseButton? createCloseButton()
{ {
if (isSelector) if (isSelector)
return Drawable.Empty(); return null;
return new ChannelListItemCloseButton return new ChannelListItemCloseButton
{ {