h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 6e7fa7ebe564e9bca957ea26ff2bee6038c2bf67
Subproject commit 0ca3fe2b5d20f9aa71ef8a65cd9a676d5d3035e3

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

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