h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 03:02:56 +08:00
Code Issues Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Andrei Zavatski 2021-01-22 22:27:26 +03:00
parent 20161aea6a
commit 3d42cc1f91
2 changed files with 26 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
View File

@ -7,7 +7,6 @@ using osu.Game.Overlays.Comments;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
namespace osu.Game.Tests.Visual.Online namespace osu.Game.Tests.Visual.Online
@ -21,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
[Cached] [Cached]
private LoginOverlay login; private LoginOverlay login;
private TestPill votePill; private VotePill votePill;
private readonly Container pillContainer; private readonly Container pillContainer;
public TestSceneVotePill() public TestSceneVotePill()
@ -44,7 +43,7 @@ namespace osu.Game.Tests.Visual.Online
AddStep("Hide login overlay", () => login.Hide()); AddStep("Hide login overlay", () => login.Hide());
AddStep("Log in", logIn); AddStep("Log in", logIn);
AddStep("User comment", () => addVotePill(getUserComment())); AddStep("User comment", () => addVotePill(getUserComment()));
AddAssert("Background is transparent", () => votePill.Background.Alpha == 0); AddAssert("Is disabled", () => !votePill.Enabled.Value);
AddStep("Click", () => votePill.Click()); AddStep("Click", () => votePill.Click());
AddAssert("Not loading", () => !votePill.IsLoading); AddAssert("Not loading", () => !votePill.IsLoading);
} }
@ -55,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
AddStep("Hide login overlay", () => login.Hide()); AddStep("Hide login overlay", () => login.Hide());
AddStep("Log in", logIn); AddStep("Log in", logIn);
AddStep("Random comment", () => addVotePill(getRandomComment())); AddStep("Random comment", () => addVotePill(getRandomComment()));
AddAssert("Background is visible", () => votePill.Background.Alpha == 1); AddAssert("Is enabled", () => votePill.Enabled.Value);
AddStep("Click", () => votePill.Click()); AddStep("Click", () => votePill.Click());
AddAssert("Loading", () => votePill.IsLoading); AddAssert("Loading", () => votePill.IsLoading);
} }
@ -89,21 +88,11 @@ namespace osu.Game.Tests.Visual.Online
private void addVotePill(Comment comment) private void addVotePill(Comment comment)
{ {
pillContainer.Clear(); pillContainer.Clear();
pillContainer.Child = votePill = new TestPill(comment) pillContainer.Child = votePill = new VotePill(comment)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
}; };
} }
private class TestPill : VotePill
{
public new Box Background => base.Background;
public TestPill(Comment comment)
: base(comment)
{
}
}
} }
} }

55
osu.Game/Overlays/Comments/VotePill.cs
View File

@ -39,10 +39,9 @@ namespace osu.Game.Overlays.Comments
[Resolved] [Resolved]
private OverlayColourProvider colourProvider { get; set; } private OverlayColourProvider colourProvider { get; set; }
protected Box Background { get; private set; } private bool isOwnComment;
private readonly Comment comment; private readonly Comment comment;
private Box background;
private Box hoverLayer; private Box hoverLayer;
private CircularContainer borderContainer; private CircularContainer borderContainer;
private SpriteText sideNumber; private SpriteText sideNumber;
@ -64,15 +63,14 @@ namespace osu.Game.Overlays.Comments
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight; isOwnComment = api.LocalUser.Value.Id == comment.UserId;
hoverLayer.Colour = Color4.Black.Opacity(0.5f);
var ownComment = api.LocalUser.Value.Id == comment.UserId;
if (!ownComment)
Action = onAction; Action = onAction;
Background.Alpha = ownComment ? 0 : 1; AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
hoverLayer.Colour = Color4.Black.Opacity(0.5f);
background.Alpha = isOwnComment ? 0 : 1;
Enabled.Value = !isOwnComment;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -80,7 +78,7 @@ namespace osu.Game.Overlays.Comments
base.LoadComplete(); base.LoadComplete();
isVoted.Value = comment.IsVoted; isVoted.Value = comment.IsVoted;
votesCount.Value = comment.VotesCount; votesCount.Value = comment.VotesCount;
isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true); isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true); votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
} }
@ -117,7 +115,7 @@ namespace osu.Game.Overlays.Comments
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
Background = new Box background = new Box
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}, },
@ -151,55 +149,48 @@ namespace osu.Game.Overlays.Comments
protected override void OnLoadStarted() protected override void OnLoadStarted()
{ {
votesCounter.FadeOut(duration, Easing.OutQuint); votesCounter.FadeOut(duration, Easing.OutQuint);
updateDisplay(); updateDisplay(false);
} }
protected override void OnLoadFinished() protected override void OnLoadFinished()
{ {
votesCounter.FadeIn(duration, Easing.OutQuint); votesCounter.FadeIn(duration, Easing.OutQuint);
updateDisplay(IsHovered);
if (IsHovered)
onHoverAction();
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
onHoverAction(); if (!isOwnComment && !IsLoading)
updateDisplay(true);
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
updateDisplay(); if (!isOwnComment && !IsLoading)
updateDisplay(false);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
private void updateDisplay() private void updateDisplay(bool isHovered)
{ {
if (Action == null)
return;
if (isVoted.Value) if (isVoted.Value)
{ {
hoverLayer.FadeTo(IsHovered ? 1 : 0); hoverLayer.FadeTo(isHovered ? 1 : 0);
sideNumber.Hide(); sideNumber.Hide();
} }
else else
sideNumber.FadeTo(IsHovered ? 1 : 0); sideNumber.FadeTo(isHovered ? 1 : 0);
borderContainer.BorderThickness = IsHovered ? 3 : 0; borderContainer.BorderThickness = isHovered ? 3 : 0;
}
private void onHoverAction()
{
if (!IsLoading)
updateDisplay();
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing);
request?.Cancel(); request?.Cancel();
base.Dispose(isDisposing);
} }
} }
} }