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

Toolbar is now toggled by the main menu.

Browse Source
This commit is contained in:
Dean Herbert
2017-02-08 19:46:05 +09:00
parent 2e119cd74f
commit a7dac15d05
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Overlays.Toolbar;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
@ -33,6 +34,8 @@ namespace osu.Game.Screens.Menu
private AudioSample sampleOsuClick;
private Toolbar toolbar;
private FlowContainerWithOrigin buttonFlow;
//todo: make these non-internal somehow.
@ -117,9 +120,10 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
private void load(AudioManager audio, OsuGame game)
{
sampleOsuClick = audio.Sample.Get(@"Menu/menuhit");
toolbar = game.Toolbar;
}
protected override void LoadComplete()
@ -150,7 +154,7 @@ namespace osu.Game.Screens.Menu
return true;
}
return false;
}
@ -215,6 +219,8 @@ namespace osu.Game.Screens.Menu
switch (state)
{
case MenuState.Initial:
toolbar?.Hide();
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out);
buttonArea.FadeOut(300);
@ -239,9 +245,10 @@ namespace osu.Game.Screens.Menu
buttonArea.FadeIn(300);
if (lastState == MenuState.Initial)
//todo: this propagates to invisible children and causes delays later down the track (on first MenuState.Play)
buttonArea.Delay(150, true);
Scheduler.AddDelayed(() => toolbar?.Show(), 150);
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Expanded;