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

Make OverlayRulesetSelector use colour provider

Browse Source
This commit is contained in:
Andrei Zavatski
2020-01-26 17:07:17 +03:00
parent a72250acc6
commit 7cd60e3193
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
View File

@ -11,7 +11,8 @@ using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Taiko;
using osu.Game.Users;
using osu.Framework.Bindables;
using osu.Game.Graphics;
using osu.Game.Overlays;
using osu.Framework.Allocation;
namespace osu.Game.Tests.Visual.Online
{
@ -23,12 +24,15 @@ namespace osu.Game.Tests.Visual.Online
typeof(ProfileRulesetTabItem),
};
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
public TestSceneProfileRulesetSelector()
{
ProfileRulesetSelector selector;
var user = new Bindable<User>();
Child = selector = new ProfileRulesetSelector(OverlayColourScheme.Green)
Child = selector = new ProfileRulesetSelector
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,

27
osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
View File

@ -12,9 +12,9 @@ using osu.Framework.Bindables;
using osu.Game.Overlays;
using osu.Game.Rulesets;
using NUnit.Framework;
using osu.Game.Graphics;
using osu.Framework.Graphics.Containers;
using osuTK;
using osu.Framework.Allocation;
namespace osu.Game.Tests.Visual.UserInterface
{
@ -40,16 +40,29 @@ namespace osu.Game.Tests.Visual.UserInterface
Spacing = new Vector2(0, 5),
Children = new[]
{
selector = new OverlayRulesetSelector(OverlayColourScheme.Green) { Current = ruleset },
new OverlayRulesetSelector(OverlayColourScheme.Blue) { Current = ruleset },
new OverlayRulesetSelector(OverlayColourScheme.Orange) { Current = ruleset },
new OverlayRulesetSelector(OverlayColourScheme.Pink) { Current = ruleset },
new OverlayRulesetSelector(OverlayColourScheme.Purple) { Current = ruleset },
new OverlayRulesetSelector(OverlayColourScheme.Red) { Current = ruleset }
new ColourProvidedContainer(OverlayColourScheme.Green, selector = new OverlayRulesetSelector { Current = ruleset }),
new ColourProvidedContainer(OverlayColourScheme.Blue, new OverlayRulesetSelector { Current = ruleset }),
new ColourProvidedContainer(OverlayColourScheme.Orange, new OverlayRulesetSelector { Current = ruleset }),
new ColourProvidedContainer(OverlayColourScheme.Pink, new OverlayRulesetSelector { Current = ruleset }),
new ColourProvidedContainer(OverlayColourScheme.Purple, new OverlayRulesetSelector { Current = ruleset }),
new ColourProvidedContainer(OverlayColourScheme.Red, new OverlayRulesetSelector { Current = ruleset }),
}
});
}
private class ColourProvidedContainer : Container
{
[Cached]
private readonly OverlayColourProvider colourProvider;
public ColourProvidedContainer(OverlayColourScheme colourScheme, OverlayRulesetSelector rulesetSelector)
{
colourProvider = new OverlayColourProvider(colourScheme);
AutoSizeAxes = Axes.Both;
Add(rulesetSelector);
}
}
[Test]
public void TestSelection()
{