h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 14:17:26 +08:00
Code Issues 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
Show Stats 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;

6
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -73,10 +73,7 @@ namespace osu.Game.Screens.Menu
buttonArea.AddRange(new[]
{
new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O)
{
VisibleState = ButtonSystemState.TopLevel,
},
new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", @"button-back-select", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel, -WEDGE_WIDTH)
{
VisibleState = ButtonSystemState.Play,
@ -98,7 +95,6 @@ namespace osu.Game.Screens.Menu
buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
buttonsTopLevel.ForEach(b => b.VisibleState = ButtonSystemState.TopLevel);
buttonArea.AddRange(buttonsPlay);
buttonArea.AddRange(buttonsTopLevel);