sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-17 11:37:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite code for clarity

Browse Source 
This also uses the AvailableRulesets list rather than private IDs
This commit is contained in:
Dean Herbert 2018-05-21 14:45:44 +09:00
parent 4055a6fc0c
commit 42519e3723
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -76,15 +76,13 @@ namespace osu.Game.Overlays.Toolbar
modeButtons.Add(new ToolbarModeButton modeButtons.Add(new ToolbarModeButton
{ {
Ruleset = r, Ruleset = r,
Action = delegate Action = delegate { ruleset.Value = r; }
{
ruleset.Value = r;
}
}); });
} }
ruleset.ValueChanged += rulesetChanged; ruleset.ValueChanged += rulesetChanged;
ruleset.DisabledChanged += disabledChanged; ruleset.DisabledChanged += disabledChanged;
if (game != null) if (game != null)
ruleset.BindTo(game.Ruleset); ruleset.BindTo(game.Ruleset);
else else
@ -94,19 +92,20 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{ {
base.OnKeyDown(state, args); base.OnKeyDown(state, args);
if (!state.Keyboard.ControlPressed || args.Repeat || (int)args.Key < 109 || (int)args.Key > 118) {
return false;
}
RulesetInfo targetRuleset = rulesets.GetRuleset(args.Key == Key.Number0 ? 9 : (int)args.Key - 110); if (state.Keyboard.ControlPressed && !args.Repeat && args.Key >= Key.Number1 && args.Key <= Key.Number9)
if (targetRuleset == null || targetRuleset == ruleset.Value) { {
return false; int requested = args.Key - Key.Number1;
}
ruleset.Value = targetRuleset; RulesetInfo found = rulesets.AvailableRulesets.Skip(requested).FirstOrDefault();
if (found != null)
ruleset.Value = found;
return true; return true;
} }
return false;
}
public override bool HandleKeyboardInput => !ruleset.Disabled && base.HandleKeyboardInput; public override bool HandleKeyboardInput => !ruleset.Disabled && base.HandleKeyboardInput;
public override bool HandleMouseInput => !ruleset.Disabled && base.HandleMouseInput; public override bool HandleMouseInput => !ruleset.Disabled && base.HandleMouseInput;