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

Framework updates.

Browse Source
This commit is contained in:
Dean Herbert
2016-09-20 14:41:55 +09:00
parent 9a5874b063
commit b9de26aa26
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 6e7fa7ebe5...0ca3fe2b5d

7
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -181,6 +181,8 @@ namespace osu.Game.GameModes.Menu
MenuState state; MenuState state;
public override bool HandleInput => state != MenuState.Exit;
public MenuState State public MenuState State
{ {
get get
@ -239,8 +241,6 @@ namespace osu.Game.GameModes.Menu
b.State = Button.ButtonState.Expanded; b.State = Button.ButtonState.Expanded;
break; break;
case MenuState.Exit: case MenuState.Exit:
HandleInput = false;
buttonArea.FadeOut(200); buttonArea.FadeOut(200);
foreach (Button b in buttonsTopLevel) foreach (Button b in buttonsTopLevel)
@ -587,9 +587,10 @@ namespace osu.Game.GameModes.Menu
//box.FlashColour(ColourHelper.Lighten2(colour, 0.7f), 200); //box.FlashColour(ColourHelper.Lighten2(colour, 0.7f), 200);
} }
public override bool HandleInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
protected override void Update() protected override void Update()
{ {
HandleInput = state != ButtonState.Exploded && box.Scale.X >= 0.8f;
iconText.Alpha = MathHelper.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1); iconText.Alpha = MathHelper.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1);
base.Update(); base.Update();
} }