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

Allow OsuScreens to decide whether ruleset switching should be allowed.

Browse Source 
Tidies up ToolbarModeSelector a lot by using DI.
This commit is contained in:
Dean Herbert
2017-04-21 16:03:59 +09:00
parent 4a3ae6937d
commit 5aa90df819
7 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -8,7 +8,6 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
using osu.Game.Database;
using osu.Game.Graphics;
using OpenTK;
@ -20,7 +19,6 @@ namespace osu.Game.Overlays.Toolbar
public const float TOOLTIP_HEIGHT = 30;
public Action OnHome;
public Action<RulesetInfo> OnRulesetChange;
private readonly ToolbarModeSelector modeSelector;
private readonly ToolbarUserArea userArea;
@ -53,13 +51,7 @@ namespace osu.Game.Overlays.Toolbar
{
Action = () => OnHome?.Invoke()
},
modeSelector = new ToolbarModeSelector
{
OnRulesetChange = mode =>
{
OnRulesetChange?.Invoke(mode);
}
}
modeSelector = new ToolbarModeSelector()
}
},
new FillFlowContainer
@ -130,8 +122,6 @@ namespace osu.Game.Overlays.Toolbar
}
}
public void SetRuleset(RulesetInfo ruleset) => modeSelector.SetRuleset(ruleset);
protected override void PopIn()
{
MoveToY(0, transition_time, EasingTypes.OutQuint);