sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-18 20:17:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Minor refactoring"

Browse Source 
This reverts commit 3d42cc1f9199715990aa25c234a15885a87ec09a.
This commit is contained in:
Andrei Zavatski 2021-01-22 22:49:49 +03:00
parent 3d42cc1f91
commit e9d10bb6e7
2 changed files with 46 additions and 26 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,6 +7,7 @@ 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
@ -20,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
[Cached] [Cached]
private LoginOverlay login; private LoginOverlay login;
private VotePill votePill; private TestPill votePill;
private readonly Container pillContainer; private readonly Container pillContainer;
public TestSceneVotePill() public TestSceneVotePill()
@ -43,7 +44,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("Is disabled", () => !votePill.Enabled.Value); AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
AddStep("Click", () => votePill.Click()); AddStep("Click", () => votePill.Click());
AddAssert("Not loading", () => !votePill.IsLoading); AddAssert("Not loading", () => !votePill.IsLoading);
} }
@ -54,7 +55,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("Is enabled", () => votePill.Enabled.Value); AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
AddStep("Click", () => votePill.Click()); AddStep("Click", () => votePill.Click());
AddAssert("Loading", () => votePill.IsLoading); AddAssert("Loading", () => votePill.IsLoading);
} }
@ -88,11 +89,21 @@ namespace osu.Game.Tests.Visual.Online
private void addVotePill(Comment comment) private void addVotePill(Comment comment)
{ {
pillContainer.Clear(); pillContainer.Clear();
pillContainer.Child = votePill = new VotePill(comment) pillContainer.Child = votePill = new TestPill(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)
{
}
}
} }
} }

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

@ -39,9 +39,10 @@ namespace osu.Game.Overlays.Comments
[Resolved] [Resolved]
private OverlayColourProvider colourProvider { get; set; } private OverlayColourProvider colourProvider { get; set; }
private bool isOwnComment; protected Box Background { get; private set; }
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;
@ -63,14 +64,15 @@ namespace osu.Game.Overlays.Comments
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
isOwnComment = api.LocalUser.Value.Id == comment.UserId;
Action = onAction;
AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight; AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
hoverLayer.Colour = Color4.Black.Opacity(0.5f); hoverLayer.Colour = Color4.Black.Opacity(0.5f);
background.Alpha = isOwnComment ? 0 : 1;
Enabled.Value = !isOwnComment; var ownComment = api.LocalUser.Value.Id == comment.UserId;
if (!ownComment)
Action = onAction;
Background.Alpha = ownComment ? 0 : 1;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -78,7 +80,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);
} }
@ -115,7 +117,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
}, },
@ -149,48 +151,55 @@ namespace osu.Game.Overlays.Comments
protected override void OnLoadStarted() protected override void OnLoadStarted()
{ {
votesCounter.FadeOut(duration, Easing.OutQuint); votesCounter.FadeOut(duration, Easing.OutQuint);
updateDisplay(false); updateDisplay();
} }
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)
{ {
if (!isOwnComment && !IsLoading) onHoverAction();
updateDisplay(true);
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
if (!isOwnComment && !IsLoading) updateDisplay();
updateDisplay(false);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
private void updateDisplay(bool isHovered) private void updateDisplay()
{ {
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)
{ {
request?.Cancel();
base.Dispose(isDisposing); base.Dispose(isDisposing);
request?.Cancel();
} }
} }
} }