RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ruleset selector line not moving on first display (#5168) 

Fix ruleset selector line not moving on first display

Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Dean Herbert 2019-06-28 00:52:11 +09:00 committed by GitHub
parent e0fb547bb3 4952fb3716
commit e8ea0594b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 15 deletions
Show Stats 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.Collections.Generic;
using osu.Framework.Graphics;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.MathUtils;
using osu.Game.Rulesets;
namespace osu.Game.Tests.Visual.UserInterface
{
@ -19,17 +22,24 @@ public class TestSceneToolbarRulesetSelector : OsuTestScene
typeof(ToolbarRulesetTabButton),
};
public TestSceneToolbarRulesetSelector()
{
ToolbarRulesetSelector selector;
[Resolved]
private RulesetStore rulesets { get; set; }
Add(new Container
[Test]
public void TestDisplay()
{
ToolbarRulesetSelector selector = null;
AddStep("create selector", () =>
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.X,
Height = Toolbar.HEIGHT,
Child = selector = new ToolbarRulesetSelector()
Child = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.X,
Height = Toolbar.HEIGHT,
Child = selector = new ToolbarRulesetSelector()
};
});
AddStep("Select random", () =>
@ -38,5 +48,32 @@ public TestSceneToolbarRulesetSelector()
});
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 @@ public class ToolbarRulesetSelector : RulesetSelector
{
private const float padding = 10;
private Drawable modeButtonLine;
protected Drawable ModeButtonLine { get; private set; }
public ToolbarRulesetSelector()
{
@ -37,7 +37,7 @@ private void load()
{
Depth = 1,
},
modeButtonLine = new Container
ModeButtonLine = new Container
{
Size = new Vector2(padding * 2 + ToolbarButton.WIDTH, 3),
Anchor = Anchor.BottomLeft,
@ -66,17 +66,22 @@ protected override void LoadComplete()
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)
{
modeButtonLine.MoveToX(tabItem.DrawPosition.X, 200, Easing.OutQuint);
ModeButtonLine.MoveToX(tabItem.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
break;
}
}
}
hasInitialPosition = true;
});
public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;