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

Give VisibleState a default rather than nullable

Browse Source
This commit is contained in:
Dean Herbert
2018-07-06 17:53:01 +09:00
parent 2aae528e1c
commit c025158735
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Menu/Button.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Screens.Menu
/// <summary>
/// The menu state for which we are visible for.
/// </summary>
public ButtonSystemState? VisibleState;
public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
private readonly Action clickAction;
private readonly Key triggerKey;
@ -300,7 +300,7 @@ namespace osu.Game.Screens.Menu
State = ButtonState.Contracted;
break;
default:
if (!VisibleState.HasValue || value == VisibleState)
if (value == VisibleState)
State = ButtonState.Expanded;
else if (value < VisibleState)
State = ButtonState.Contracted;