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

Use new SpotlightSelector in RankingsHeader

Browse Source
This commit is contained in:
Andrei Zavatski
2020-02-05 11:21:23 +03:00
parent e119040d5d
commit a3fd952f74
3 changed files with 16 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
View File

@ -8,21 +8,20 @@ using osu.Game.Rulesets;
using osu.Game.Users;
using System.Collections.Generic;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Allocation;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Overlays.Rankings
{
public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
{
public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
public readonly Bindable<APISpotlight> Spotlight = new Bindable<APISpotlight>();
public readonly Bindable<Country> Country = new Bindable<Country>();
public IEnumerable<Spotlight> Spotlights
public IEnumerable<APISpotlight> Spotlights
{
get => spotlightsContainer.Spotlights;
set => spotlightsContainer.Spotlights = value;
get => spotlightSelector.Spotlights;
set => spotlightSelector.Spotlights = value;
}
protected override ScreenTitle CreateTitle() => new RankingsTitle
@ -35,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
Current = Ruleset
};
private SpotlightsContainer spotlightsContainer;
private SpotlightSelector spotlightSelector;
protected override Drawable CreateContent() => new FillFlowContainer
{
@ -48,9 +47,9 @@ namespace osu.Game.Overlays.Rankings
{
Current = Country
},
spotlightsContainer = new SpotlightsContainer
spotlightSelector = new SpotlightSelector
{
Spotlight = { BindTarget = Spotlight }
Current = { BindTarget = Spotlight }
}
}
};
@ -62,7 +61,7 @@ namespace osu.Game.Overlays.Rankings
}
private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
spotlightsContainer.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
spotlightSelector.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
private class RankingsTitle : ScreenTitle
{
@ -81,48 +80,6 @@ namespace osu.Game.Overlays.Rankings
protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/rankings");
}
private class SpotlightsContainer : CompositeDrawable
{
public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
public IEnumerable<Spotlight> Spotlights
{
get => dropdown.Items;
set => dropdown.Items = value;
}
private readonly OsuDropdown<Spotlight> dropdown;
private readonly Box background;
public SpotlightsContainer()
{
Height = 100;
RelativeSizeAxes = Axes.X;
InternalChildren = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
},
dropdown = new OsuDropdown<Spotlight>
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
Width = 0.8f,
Current = Spotlight,
Y = 20,
}
};
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
background.Colour = colourProvider.Dark3;
}
}
}
public enum RankingsScope