h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:47:52 +08:00
Code Issues Releases Wiki Activity

Refactor ControlItemMention to use bindable flow

Browse Source
This commit is contained in:
Jai Sharma 2022-03-14 21:26:33 +00:00
parent 1f0f6990f0
commit b01a809d55
3 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Online/TestSceneChannelControlItem.cs
View File

@ -129,19 +129,19 @@ namespace osu.Game.Tests.Visual.Online
AddStep("Add Mention Selected", () => AddStep("Add Mention Selected", () =>
{ {
if (selected.Value != null) if (selected.Value != null)
channelMap[selected.Value].MentionCount++; channelMap[selected.Value].Mentions.Value++;
}); });
AddStep("Add 98 Mentions Selected", () => AddStep("Add 98 Mentions Selected", () =>
{ {
if (selected.Value != null) if (selected.Value != null)
channelMap[selected.Value].MentionCount += 98; channelMap[selected.Value].Mentions.Value += 98;
}); });
AddStep("Clear Mentions Selected", () => AddStep("Clear Mentions Selected", () =>
{ {
if (selected.Value != null) if (selected.Value != null)
channelMap[selected.Value].MentionCount = 0; channelMap[selected.Value].Mentions.Value = 0;
}); });
} }

11
osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
View File

@ -20,15 +20,8 @@ namespace osu.Game.Overlays.Chat.ChannelControl
public event Action<Channel>? OnRequestSelect; public event Action<Channel>? OnRequestSelect;
public event Action<Channel>? OnRequestLeave; public event Action<Channel>? OnRequestLeave;
public int MentionCount [Cached]
{ public readonly BindableInt Mentions = new BindableInt();
get => mention?.MentionCount ?? 0;
set
{
if (mention != null)
mention.MentionCount = value;
}
}
public bool HasUnread public bool HasUnread
{ {

41
osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
View File

@ -4,6 +4,7 @@
#nullable enable #nullable enable
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -15,23 +16,11 @@ namespace osu.Game.Overlays.Chat.ChannelControl
{ {
public class ControlItemMention : CircularContainer public class ControlItemMention : CircularContainer
{ {
private int mentionCount;
public int MentionCount
{
get => mentionCount;
set
{
if (value == mentionCount)
return;
mentionCount = value;
updateText();
}
}
private OsuSpriteText? countText; private OsuSpriteText? countText;
[Resolved]
private BindableInt mentions { get; set; } = null!;
[Resolved] [Resolved]
private OsuColour osuColour { get; set; } = null!; private OsuColour osuColour { get; set; } = null!;
@ -61,18 +50,24 @@ namespace osu.Game.Overlays.Chat.ChannelControl
Colour = colourProvider.Background5, Colour = colourProvider.Background5,
}, },
}; };
updateText();
} }
private void updateText() protected override void LoadComplete()
{ {
countText!.Text = MentionCount > 99 ? "99+" : MentionCount.ToString(); base.LoadComplete();
if (mentionCount > 0) mentions.BindValueChanged(change =>
Show(); {
else int mentionCount = change.NewValue;
Hide();
countText!.Text = mentionCount > 99 ? "99+" : mentionCount.ToString();
if (mentionCount > 0)
Show();
else
Hide();
}, true);
} }
} }
} }