h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 18:03:21 +08:00
Code Issues Releases Wiki Activity

Rename I{Multiplayer -> OnlinePlay}SubScreen

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-25 17:05:29 +01:00
parent e5064ee930
commit 4c43a67b68
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
OsuScreenStack screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both }; OsuScreenStack screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
screenStack.Push(new TestMultiplayerSubScreen(index)); screenStack.Push(new TestOnlinePlaySubScreen(index));
Children = new Drawable[] Children = new Drawable[]
{ {
@ -26,16 +26,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
new Header("Multiplayer", screenStack) new Header("Multiplayer", screenStack)
}; };
AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index))); AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestOnlinePlaySubScreen(++index)));
} }
private class TestMultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen private class TestOnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
{ {
private readonly int index; private readonly int index;
public string ShortTitle => $"Screen {index}"; public string ShortTitle => $"Screen {index}";
public TestMultiplayerSubScreen(int index) public TestOnlinePlaySubScreen(int index)
{ {
this.index = index; this.index = index;
} }

6
osu.Game/Screens/OnlinePlay/Header.cs
View File

@ -61,8 +61,8 @@ namespace osu.Game.Screens.OnlinePlay
breadcrumbs.Current.ValueChanged += screen => breadcrumbs.Current.ValueChanged += screen =>
{ {
if (screen.NewValue is IMultiplayerSubScreen multiScreen) if (screen.NewValue is IOnlinePlaySubScreen onlineSubScreen)
title.Screen = multiScreen; title.Screen = onlineSubScreen;
}; };
breadcrumbs.Current.TriggerChange(); breadcrumbs.Current.TriggerChange();
@ -75,7 +75,7 @@ namespace osu.Game.Screens.OnlinePlay
private readonly OsuSpriteText dot; private readonly OsuSpriteText dot;
private readonly OsuSpriteText pageTitle; private readonly OsuSpriteText pageTitle;
public IMultiplayerSubScreen Screen public IOnlinePlaySubScreen Screen
{ {
set => pageTitle.Text = value.ShortTitle.Titleize(); set => pageTitle.Text = value.ShortTitle.Titleize();
} }

2
osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs → osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Screens.OnlinePlay namespace osu.Game.Screens.OnlinePlay
{ {
public interface IMultiplayerSubScreen : IOsuScreen public interface IOnlinePlaySubScreen : IOsuScreen
{ {
string Title { get; } string Title { get; }

2
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Screens.Select;
namespace osu.Game.Screens.OnlinePlay.Multiplayer namespace osu.Game.Screens.OnlinePlay.Multiplayer
{ {
public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen public class MultiplayerMatchSongSelect : SongSelect, IOnlinePlaySubScreen
{ {
public string ShortTitle => "song selection"; public string ShortTitle => "song selection";

4
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay
[Cached] [Cached]
public abstract class OnlinePlayScreen : OsuScreen public abstract class OnlinePlayScreen : OsuScreen
{ {
public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true; public override bool CursorVisible => (screenStack.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
// this is required due to PlayerLoader eventually being pushed to the main stack // this is required due to PlayerLoader eventually being pushed to the main stack
// while leases may be taken out by a subscreen. // while leases may be taken out by a subscreen.
@ -245,7 +245,7 @@ namespace osu.Game.Screens.OnlinePlay
public override bool OnBackButton() public override bool OnBackButton()
{ {
if ((screenStack.CurrentScreen as IMultiplayerSubScreen)?.OnBackButton() == true) if ((screenStack.CurrentScreen as IOnlinePlaySubScreen)?.OnBackButton() == true)
return true; return true;
if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen)) if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))

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

@ -7,7 +7,7 @@ using osu.Framework.Screens;
namespace osu.Game.Screens.OnlinePlay namespace osu.Game.Screens.OnlinePlay
{ {
public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen public abstract class OnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
{ {
public override bool DisallowExternalBeatmapRulesetChanges => false; public override bool DisallowExternalBeatmapRulesetChanges => false;

2
osu.Game/Screens/Select/MatchSongSelect.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Screens.OnlinePlay.Components;
namespace osu.Game.Screens.Select namespace osu.Game.Screens.Select
{ {
public class MatchSongSelect : SongSelect, IMultiplayerSubScreen public class MatchSongSelect : SongSelect, IOnlinePlaySubScreen
{ {
public Action<PlaylistItem> Selected; public Action<PlaylistItem> Selected;