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

Fix ruleset selector line not moving on first display

Browse Source
This commit is contained in:
smoogipoo
2019-06-27 18:25:38 +09:00
parent 7762b67ecb
commit f6f547a91b
2 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using System.Linq; using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Game.Rulesets;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
@ -19,17 +22,24 @@ namespace osu.Game.Tests.Visual.UserInterface
typeof(ToolbarRulesetTabButton), typeof(ToolbarRulesetTabButton),
}; };
public TestSceneToolbarRulesetSelector() [Resolved]
{ private RulesetStore rulesets { get; set; }
ToolbarRulesetSelector selector;
Add(new Container [Test]
public void TestDisplay()
{
ToolbarRulesetSelector selector = null;
AddStep("create selector", () =>
{ {
Anchor = Anchor.Centre, Child = new Container
Origin = Anchor.Centre, {
AutoSizeAxes = Axes.X, Anchor = Anchor.Centre,
Height = Toolbar.HEIGHT, Origin = Anchor.Centre,
Child = selector = new ToolbarRulesetSelector() AutoSizeAxes = Axes.X,
Height = Toolbar.HEIGHT,
Child = selector = new ToolbarRulesetSelector()
};
}); });
AddStep("Select random", () => AddStep("Select random", () =>
@ -38,5 +48,32 @@ namespace osu.Game.Tests.Visual.UserInterface
}); });
AddStep("Toggle disabled state", () => selector.Current.Disabled = !selector.Current.Disabled); AddStep("Toggle disabled state", () => selector.Current.Disabled = !selector.Current.Disabled);
} }
[Test]
public void TestNonFirstRulesetInitialState()
{
TestSelector selector = null;
AddStep("create selector", () =>
{
Child = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.X,
Height = Toolbar.HEIGHT,
Child = selector = new TestSelector()
};
selector.Current.Value = rulesets.GetRuleset(2);
});
AddAssert("mode line has moved", () => selector.ModeButtonLine.DrawPosition.X > 0);
}
private class TestSelector : ToolbarRulesetSelector
{
public new Drawable ModeButtonLine => base.ModeButtonLine;
}
} }
} }

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

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
private const float padding = 10; private const float padding = 10;
private Drawable modeButtonLine; protected Drawable ModeButtonLine { get; private set; }
public ToolbarRulesetSelector() public ToolbarRulesetSelector()
{ {
@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
Depth = 1, Depth = 1,
}, },
modeButtonLine = new Container ModeButtonLine = new Container
{ {
Size = new Vector2(padding * 2 + ToolbarButton.WIDTH, 3), Size = new Vector2(padding * 2 + ToolbarButton.WIDTH, 3),
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
@ -66,17 +66,22 @@ namespace osu.Game.Overlays.Toolbar
Current.BindValueChanged(_ => moveLineToCurrent(), true); Current.BindValueChanged(_ => moveLineToCurrent(), true);
} }
private void moveLineToCurrent() private bool hasInitialPosition;
// Scheduled to allow the flow layout to be computed before the line position is updated
private void moveLineToCurrent() => ScheduleAfterChildren(() =>
{ {
foreach (TabItem<RulesetInfo> tabItem in TabContainer) foreach (var tabItem in TabContainer)
{ {
if (tabItem.Value == Current.Value) if (tabItem.Value == Current.Value)
{ {
modeButtonLine.MoveToX(tabItem.DrawPosition.X, 200, Easing.OutQuint); ModeButtonLine.MoveToX(tabItem.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
break; break;
} }
} }
}
hasInitialPosition = true;
});
public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput; public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;