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

Naming adjustments

Browse Source
This commit is contained in:
EVAST9919 2019-06-12 20:51:21 +03:00
parent 065b4cd055
commit 3150b5cfb4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Menus
{ {
typeof(ToolbarButton), typeof(ToolbarButton),
typeof(ToolbarRulesetSelector), typeof(ToolbarRulesetSelector),
typeof(ToolbarRulesetButton), typeof(ToolbarRulesetTabButton),
typeof(ToolbarNotificationButton), typeof(ToolbarNotificationButton),
}; };

2
osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.UserInterface
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
typeof(ToolbarRulesetSelector), typeof(ToolbarRulesetSelector),
typeof(ToolbarRulesetButton), typeof(ToolbarRulesetTabButton),
}; };
public TestSceneToolbarRulesetSelector() public TestSceneToolbarRulesetSelector()

2
osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Toolbar
protected override Dropdown<RulesetInfo> CreateDropdown() => null; protected override Dropdown<RulesetInfo> CreateDropdown() => null;
protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ToolbarRulesetButton(value); protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ToolbarRulesetTabButton(value);
public ToolbarRulesetSelector() public ToolbarRulesetSelector()
{ {

10
osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs → osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
View File

@ -10,16 +10,16 @@ using osu.Framework.Input.Events;
namespace osu.Game.Overlays.Toolbar namespace osu.Game.Overlays.Toolbar
{ {
public class ToolbarRulesetButton : TabItem<RulesetInfo> public class ToolbarRulesetTabButton : TabItem<RulesetInfo>
{ {
private readonly DrawableRuleset ruleset; private readonly RulesetButton ruleset;
public ToolbarRulesetButton(RulesetInfo value) public ToolbarRulesetTabButton(RulesetInfo value)
: base(value) : base(value)
{ {
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
RelativeSizeAxes = Axes.Y; RelativeSizeAxes = Axes.Y;
Child = ruleset = new DrawableRuleset Child = ruleset = new RulesetButton
{ {
Active = false, Active = false,
}; };
@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Toolbar
protected override void OnDeactivated() => ruleset.Active = false; protected override void OnDeactivated() => ruleset.Active = false;
private class DrawableRuleset : ToolbarButton private class RulesetButton : ToolbarButton
{ {
public bool Active public bool Active
{ {