h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:02:55 +08:00
Code Issues Releases Wiki Activity

Use plum colour scheme in multiplayer to match rest of multiplayer screens

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-05-04 22:17:40 +02:00
parent 1744d7e4f0
commit ac08498f35
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
7 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/UserInterface/TestSceneShearedOverlayContainer.cs
View File

@ -66,7 +66,10 @@ namespace osu.Game.Tests.Visual.UserInterface
public class TestShearedOverlayContainer : ShearedOverlayContainer
{
protected override OverlayColourScheme ColourScheme => OverlayColourScheme.Green;
public TestShearedOverlayContainer()
: base(OverlayColourScheme.Green)
{
}
[BackgroundDependencyLoader]
private void load()

7
osu.Game/Overlays/FirstRunSetupOverlay.cs
View File

@ -31,8 +31,6 @@ namespace osu.Game.Overlays
[Cached]
public class FirstRunSetupOverlay : ShearedOverlayContainer
{
protected override OverlayColourScheme ColourScheme => OverlayColourScheme.Purple;
[Resolved]
private IPerformFromScreenRunner performer { get; set; } = null!;
@ -70,6 +68,11 @@ namespace osu.Game.Overlays
private Container content = null!;
public FirstRunSetupOverlay()
: base(OverlayColourScheme.Purple)
{
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{

7
osu.Game/Overlays/Mods/ModSelectScreen.cs
View File

@ -27,8 +27,6 @@ namespace osu.Game.Overlays.Mods
{
public abstract class ModSelectScreen : ShearedOverlayContainer
{
protected override OverlayColourScheme ColourScheme => OverlayColourScheme.Green;
[Cached]
public Bindable<IReadOnlyList<Mod>> SelectedMods { get; private set; } = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
@ -65,6 +63,11 @@ namespace osu.Game.Overlays.Mods
private ColumnScrollContainer columnScroll = null!;
private ColumnFlowContainer columnFlow = null!;
protected ModSelectScreen(OverlayColourScheme colourScheme = OverlayColourScheme.Green)
: base(colourScheme)
{
}
[BackgroundDependencyLoader]
private void load()
{

6
osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
View File

@ -51,17 +51,15 @@ namespace osu.Game.Overlays.Mods
/// </summary>
protected Container FooterContent { get; private set; }
protected abstract OverlayColourScheme ColourScheme { get; }
protected override bool StartHidden => true;
protected override bool BlockNonPositionalInput => true;
protected ShearedOverlayContainer()
protected ShearedOverlayContainer(OverlayColourScheme colourScheme)
{
RelativeSizeAxes = Axes.Both;
ColourProvider = new OverlayColourProvider(ColourScheme);
ColourProvider = new OverlayColourProvider(colourScheme);
}
[BackgroundDependencyLoader]

5
osu.Game/Overlays/Mods/UserModSelectScreen.cs
View File

@ -12,6 +12,11 @@ namespace osu.Game.Overlays.Mods
{
public class UserModSelectScreen : ModSelectScreen
{
public UserModSelectScreen(OverlayColourScheme colourScheme = OverlayColourScheme.Green)
: base(colourScheme)
{
}
protected override ModColumn CreateModColumn(ModType modType, Key[] toggleKeys = null) => new UserModColumn(modType, false, toggleKeys);
protected override IReadOnlyList<Mod> ComputeNewModsFromSelection(IReadOnlyList<Mod> oldSelection, IReadOnlyList<Mod> newSelection)

2
osu.Game/Screens/OnlinePlay/FreeModSelectScreen.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Game.Overlays;
using osu.Game.Overlays.Mods;
using osu.Game.Rulesets.Mods;
using osuTK.Input;
@ -20,6 +21,7 @@ namespace osu.Game.Screens.OnlinePlay
}
public FreeModSelectScreen()
: base(OverlayColourScheme.Plum)
{
IsValidMod = _ => true;
}

3
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Online.API;
using osu.Game.Online.Rooms;
using osu.Game.Overlays;
using osu.Game.Overlays.Mods;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
@ -153,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay
return base.OnExiting(e);
}
protected override ModSelectScreen CreateModSelectOverlay() => new UserModSelectScreen
protected override ModSelectScreen CreateModSelectOverlay() => new UserModSelectScreen(OverlayColourScheme.Plum)
{
IsValidMod = IsValidMod
};