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

Simplify hover/unhover logic

Browse Source
This commit is contained in:
Andrei Zavatski
2019-10-18 03:06:01 +03:00
parent 22511e41e2
commit 9daafb4636
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ namespace osu.Game.Overlays.Comments
AlwaysPresent = true, AlwaysPresent = true,
}; };
protected override void OnLoadingStart() => onHoverLostAction(); protected override void OnLoadingStart() => updateDisplay();
protected override void OnLoadingFinished() protected override void OnLoadingFinished()
{ {
@ -144,31 +144,27 @@ namespace osu.Game.Overlays.Comments
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
onHoverLostAction(); updateDisplay();
base.OnHoverLost(e); base.OnHoverLost(e);
} }
private void onHoverLostAction() private void updateDisplay()
{ {
if (isVoted.Value) if (isVoted.Value)
hoverLayer.Hide(); {
else hoverLayer.FadeTo(IsHovered ? 1 : 0);
sideNumber.Hide(); sideNumber.Hide();
}
else
sideNumber.FadeTo(IsHovered ? 1 : 0);
borderContainer.BorderThickness = 0; borderContainer.BorderThickness = IsHovered ? 3 : 0;
} }
private void onHoverAction() private void onHoverAction()
{ {
if (!IsLoading) if (!IsLoading)
{ updateDisplay();
borderContainer.BorderThickness = 3;
if (!isVoted.Value)
sideNumber.Show();
else
hoverLayer.Show();
}
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)