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

Simplify expand/contract code

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-12-19 14:52:27 +01:00
parent 772ac2d326
commit 7d1473c5d0
No known key found for this signature in database
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game/Screens/Play/HUD/ModDisplay.cs
View File

@ -33,12 +33,7 @@ namespace osu.Game.Screens.Play.HUD
expansionMode = value;
if (IsLoaded)
{
if (expansionMode == ExpansionMode.AlwaysExpanded || (expansionMode == ExpansionMode.ExpandOnHover && IsHovered))
expand();
else if (expansionMode == ExpansionMode.AlwaysContracted || (expansionMode == ExpansionMode.ExpandOnHover && !IsHovered))
contract();
}
updateExpansionMode();
}
}
@ -88,24 +83,7 @@ namespace osu.Game.Screens.Play.HUD
base.LoadComplete();
Current.BindValueChanged(updateDisplay, true);
switch (expansionMode)
{
case ExpansionMode.AlwaysExpanded:
expand(0);
break;
case ExpansionMode.AlwaysContracted:
contract(0);
break;
case ExpansionMode.ExpandOnHover:
if (IsHovered)
expand(0);
else
contract(0);
break;
}
updateExpansionMode(0);
}
private void updateDisplay(ValueChangedEvent<IReadOnlyList<Mod>> mods)
@ -116,6 +94,27 @@ namespace osu.Game.Screens.Play.HUD
iconsContainer.Add(new ModIcon(mod, showExtendedInformation: showExtendedInformation) { Scale = new Vector2(0.6f) });
}
private void updateExpansionMode(double duration = 500)
{
switch (expansionMode)
{
case ExpansionMode.AlwaysExpanded:
expand(duration);
break;
case ExpansionMode.AlwaysContracted:
contract(duration);
break;
case ExpansionMode.ExpandOnHover:
if (IsHovered)
expand(duration);
else
contract(duration);
break;
}
}
private void expand(double duration = 500)
{
if (ExpansionMode != ExpansionMode.AlwaysContracted)