mirror of
https://github.com/osukey/osukey.git
synced 2025-07-25 12:20:02 +09:00
Rename MatchSettingsOverlay and related classes
Because "match" is a multiplayer-only concept.
This commit is contained in:
@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Playlists
|
|||||||
AddUntilStep("error not displayed", () => !settings.ErrorText.IsPresent);
|
AddUntilStep("error not displayed", () => !settings.ErrorText.IsPresent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private class TestRoomSettings : PlaylistsMatchSettingsOverlay
|
private class TestRoomSettings : PlaylistsRoomSettingsOverlay
|
||||||
{
|
{
|
||||||
public TriangleButton ApplyButton => ((MatchSettings)Settings).ApplyButton;
|
public TriangleButton ApplyButton => ((MatchSettings)Settings).ApplyButton;
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ namespace osu.Game.Tests.Visual.Playlists
|
|||||||
|
|
||||||
AddStep("move mouse to create button", () =>
|
AddStep("move mouse to create button", () =>
|
||||||
{
|
{
|
||||||
InputManager.MoveMouseTo(this.ChildrenOfType<PlaylistsMatchSettingsOverlay.CreateRoomButton>().Single());
|
InputManager.MoveMouseTo(this.ChildrenOfType<PlaylistsRoomSettingsOverlay.CreateRoomButton>().Single());
|
||||||
});
|
});
|
||||||
|
|
||||||
AddStep("click", () => InputManager.Click(MouseButton.Left));
|
AddStep("click", () => InputManager.Click(MouseButton.Left));
|
||||||
@ -147,7 +147,7 @@ namespace osu.Game.Tests.Visual.Playlists
|
|||||||
|
|
||||||
AddStep("create room", () =>
|
AddStep("create room", () =>
|
||||||
{
|
{
|
||||||
InputManager.MoveMouseTo(match.ChildrenOfType<PlaylistsMatchSettingsOverlay.CreateRoomButton>().Single());
|
InputManager.MoveMouseTo(match.ChildrenOfType<PlaylistsRoomSettingsOverlay.CreateRoomButton>().Single());
|
||||||
InputManager.Click(MouseButton.Left);
|
InputManager.Click(MouseButton.Left);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ using osuTK.Graphics;
|
|||||||
|
|
||||||
namespace osu.Game.Screens.OnlinePlay.Match.Components
|
namespace osu.Game.Screens.OnlinePlay.Match.Components
|
||||||
{
|
{
|
||||||
public abstract class MatchSettingsOverlay : FocusedOverlayContainer, IKeyBindingHandler<GlobalAction>
|
public abstract class RoomSettingsOverlay : FocusedOverlayContainer, IKeyBindingHandler<GlobalAction>
|
||||||
{
|
{
|
||||||
protected const float TRANSITION_DURATION = 350;
|
protected const float TRANSITION_DURATION = 350;
|
||||||
protected const float FIELD_PADDING = 45;
|
protected const float FIELD_PADDING = 45;
|
@ -26,7 +26,7 @@ using osuTK;
|
|||||||
|
|
||||||
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
|
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
|
||||||
{
|
{
|
||||||
public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
|
public class MultiplayerMatchSettingsOverlay : RoomSettingsOverlay
|
||||||
{
|
{
|
||||||
private MatchSettings settings;
|
private MatchSettings settings;
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ using osuTK;
|
|||||||
|
|
||||||
namespace osu.Game.Screens.OnlinePlay.Playlists
|
namespace osu.Game.Screens.OnlinePlay.Playlists
|
||||||
{
|
{
|
||||||
public class PlaylistsMatchSettingsOverlay : MatchSettingsOverlay
|
public class PlaylistsRoomSettingsOverlay : RoomSettingsOverlay
|
||||||
{
|
{
|
||||||
public Action EditPlaylist;
|
public Action EditPlaylist;
|
||||||
|
|
@ -39,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
|
|||||||
|
|
||||||
private readonly IBindable<bool> isIdle = new BindableBool();
|
private readonly IBindable<bool> isIdle = new BindableBool();
|
||||||
|
|
||||||
private MatchSettingsOverlay settingsOverlay;
|
private RoomSettingsOverlay settingsOverlay;
|
||||||
private MatchLeaderboard leaderboard;
|
private MatchLeaderboard leaderboard;
|
||||||
private OverlinedHeader participantsHeader;
|
private OverlinedHeader participantsHeader;
|
||||||
private GridContainer mainContent;
|
private GridContainer mainContent;
|
||||||
@ -237,7 +237,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
|
|||||||
new Dimension(GridSizeMode.AutoSize),
|
new Dimension(GridSizeMode.AutoSize),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
settingsOverlay = new PlaylistsMatchSettingsOverlay
|
settingsOverlay = new PlaylistsRoomSettingsOverlay
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
EditPlaylist = () =>
|
EditPlaylist = () =>
|
||||||
|
Reference in New Issue
Block a user