sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +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

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

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Toolbar
{
private const float padding = 10;
private Drawable modeButtonLine;
protected Drawable ModeButtonLine { get; private set; }
public ToolbarRulesetSelector()
{
@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Toolbar
{
Depth = 1,
},
modeButtonLine = new Container
ModeButtonLine = new Container
{
Size = new Vector2(padding * 2 + ToolbarButton.WIDTH, 3),
Anchor = Anchor.BottomLeft,
@ -66,17 +66,22 @@ namespace osu.Game.Overlays.Toolbar
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;