mirror of
https://github.com/ppy/osu.git
synced 2025-03-05 14:22:55 +08:00
Implement HeaderTitle component for RankingsOverlay
This commit is contained in:
parent
eee1cad760
commit
dbfbd1262f
60
osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs
Normal file
60
osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Game.Overlays.Rankings;
|
||||||
|
using osu.Game.Users;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Visual.Online
|
||||||
|
{
|
||||||
|
public class TestSceneRankingsHeaderTitle : OsuTestScene
|
||||||
|
{
|
||||||
|
public override IReadOnlyList<Type> RequiredTypes => new[]
|
||||||
|
{
|
||||||
|
typeof(HeaderFlag),
|
||||||
|
typeof(HeaderTitle),
|
||||||
|
};
|
||||||
|
|
||||||
|
public TestSceneRankingsHeaderTitle()
|
||||||
|
{
|
||||||
|
var countryBindable = new Bindable<Country>();
|
||||||
|
var scope = new Bindable<RankingsScope>();
|
||||||
|
|
||||||
|
Add(new HeaderTitle
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Country = { BindTarget = countryBindable },
|
||||||
|
Scope = { BindTarget = scope },
|
||||||
|
});
|
||||||
|
|
||||||
|
var countryA = new Country
|
||||||
|
{
|
||||||
|
FlagName = "BY",
|
||||||
|
FullName = "Belarus"
|
||||||
|
};
|
||||||
|
|
||||||
|
var countryB = new Country
|
||||||
|
{
|
||||||
|
FlagName = "US",
|
||||||
|
FullName = "United States"
|
||||||
|
};
|
||||||
|
|
||||||
|
AddStep("Set country", () => countryBindable.Value = countryA);
|
||||||
|
AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
|
||||||
|
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
|
||||||
|
AddAssert("Check country is Null", () => countryBindable.Value == null);
|
||||||
|
|
||||||
|
AddStep("Set country 1", () => countryBindable.Value = countryA);
|
||||||
|
AddStep("Set country 2", () => countryBindable.Value = countryB);
|
||||||
|
AddStep("Set null country", () => countryBindable.Value = null);
|
||||||
|
AddStep("Set scope to Performance", () => scope.Value = RankingsScope.Performance);
|
||||||
|
AddStep("Set scope to Spotlights", () => scope.Value = RankingsScope.Spotlights);
|
||||||
|
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
|
||||||
|
AddStep("Set scope to Country", () => scope.Value = RankingsScope.Country);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
105
osu.Game/Overlays/Rankings/HeaderTitle.cs
Normal file
105
osu.Game/Overlays/Rankings/HeaderTitle.cs
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Users;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osuTK;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
|
||||||
|
namespace osu.Game.Overlays.Rankings
|
||||||
|
{
|
||||||
|
public class HeaderTitle : CompositeDrawable
|
||||||
|
{
|
||||||
|
private const int spacing = 10;
|
||||||
|
private const int flag_margin = 5;
|
||||||
|
private const int text_size = 40;
|
||||||
|
|
||||||
|
public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
|
||||||
|
public readonly Bindable<Country> Country = new Bindable<Country>();
|
||||||
|
|
||||||
|
private readonly SpriteText scopeText;
|
||||||
|
private readonly Container flagPlaceholder;
|
||||||
|
private readonly HeaderFlag flag;
|
||||||
|
|
||||||
|
public HeaderTitle()
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both;
|
||||||
|
InternalChild = new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Spacing = new Vector2(spacing, 0),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
flagPlaceholder = new Container
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Margin = new MarginPadding { Bottom = flag_margin },
|
||||||
|
Child = flag = new HeaderFlag
|
||||||
|
{
|
||||||
|
Size = new Vector2(30, 20),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
scopeText = new SpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Light)
|
||||||
|
},
|
||||||
|
new SpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Light),
|
||||||
|
Text = @"Ranking"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
flag.Action += () => Country.Value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OsuColour colours)
|
||||||
|
{
|
||||||
|
scopeText.Colour = colours.Lime;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void LoadComplete()
|
||||||
|
{
|
||||||
|
Scope.BindValueChanged(scope => onScopeChanged(scope.NewValue), true);
|
||||||
|
Country.BindValueChanged(onCountryChanged, true);
|
||||||
|
base.LoadComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onScopeChanged(RankingsScope scope)
|
||||||
|
{
|
||||||
|
scopeText.Text = scope.ToString();
|
||||||
|
|
||||||
|
if (scope != RankingsScope.Performance)
|
||||||
|
Country.Value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onCountryChanged(ValueChangedEvent<Country> country)
|
||||||
|
{
|
||||||
|
if (country.NewValue == null)
|
||||||
|
{
|
||||||
|
flagPlaceholder.Hide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Scope.Value = RankingsScope.Performance;
|
||||||
|
|
||||||
|
if (country.OldValue == null)
|
||||||
|
flagPlaceholder.Show();
|
||||||
|
|
||||||
|
flag.Country = country.NewValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user