h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 21:27:24 +08:00
Code Issues Releases Wiki Activity

Move toolbar to OsuGame.

Browse Source
This commit is contained in:
Dean Herbert 2016-10-01 18:01:52 +09:00
parent f0681f35c4
commit 7db555be5d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/OsuGame.cs
View File

@ -10,11 +10,14 @@ using osu.Framework.OS;
using osu.Game.Graphics.Background;
using osu.Game.GameModes.Play;
using osu.Game.Graphics.Containers;
using osu.Game.Overlays;
namespace osu.Game
{
public class OsuGame : OsuGameBase
{
public Toolbar Toolbar;
public override void SetHost(BasicGameHost host)
{
base.SetHost(host);
@ -33,7 +36,8 @@ namespace osu.Game
new Background()
}
},
new MainMenu()
new MainMenu(),
Toolbar = new Toolbar(),
});
}

3
osu.Game/OsuGameBase.cs
View File

@ -20,8 +20,6 @@ namespace osu.Game
public Options Options;
public APIAccess API;
public Toolbar Toolbar;
protected override Container AddTarget => ratioContainer?.IsLoaded == true ? ratioContainer : base.AddTarget;
@ -50,7 +48,6 @@ namespace osu.Game
{
Children = new Drawable[]
{
Toolbar = new Toolbar(),
Options = new Options(),
new OsuCursorContainer()
}