From 4aff2ba2af41fb7723bf5980890594a8a48e4d82 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Wed, 6 Jun 2018 06:25:34 -0300 Subject: [PATCH] Move settings to subfolder. --- osu.Game/Screens/Multi/Screens/Match/Match.cs | 1 + .../Multi/Screens/Match/{ => Settings}/GameTypePicker.cs | 2 +- .../Screens/Match/{ => Settings}/RoomAvailabilityPicker.cs | 2 +- .../Multi/Screens/Match/{ => Settings}/RoomSettingsOverlay.cs | 4 +--- 4 files changed, 4 insertions(+), 5 deletions(-) rename osu.Game/Screens/Multi/Screens/Match/{ => Settings}/GameTypePicker.cs (98%) rename osu.Game/Screens/Multi/Screens/Match/{ => Settings}/RoomAvailabilityPicker.cs (97%) rename osu.Game/Screens/Multi/Screens/Match/{ => Settings}/RoomSettingsOverlay.cs (98%) diff --git a/osu.Game/Screens/Multi/Screens/Match/Match.cs b/osu.Game/Screens/Multi/Screens/Match/Match.cs index 41c497834a..91b0d3e106 100644 --- a/osu.Game/Screens/Multi/Screens/Match/Match.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Match.cs @@ -7,6 +7,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; using osu.Game.Online.Multiplayer; +using osu.Game.Screens.Multi.Screens.Match.Settings; using osu.Game.Screens.Select; using osu.Game.Users; diff --git a/osu.Game/Screens/Multi/Screens/Match/GameTypePicker.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs similarity index 98% rename from osu.Game/Screens/Multi/Screens/Match/GameTypePicker.cs rename to osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs index 1b4d69a35b..50df4ea334 100644 --- a/osu.Game/Screens/Multi/Screens/Match/GameTypePicker.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs @@ -13,7 +13,7 @@ using osu.Game.Online.Multiplayer; using osu.Game.Screens.Multi.Components; using OpenTK; -namespace osu.Game.Screens.Multi.Screens.Match +namespace osu.Game.Screens.Multi.Screens.Match.Settings { public class GameTypePicker : FillFlowContainer, IHasCurrentValue { diff --git a/osu.Game/Screens/Multi/Screens/Match/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs similarity index 97% rename from osu.Game/Screens/Multi/Screens/Match/RoomAvailabilityPicker.cs rename to osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs index 825cfc0270..715c74fbe5 100644 --- a/osu.Game/Screens/Multi/Screens/Match/RoomAvailabilityPicker.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs @@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites; using osu.Game.Online.Multiplayer; using OpenTK; -namespace osu.Game.Screens.Multi.Screens.Match +namespace osu.Game.Screens.Multi.Screens.Match.Settings { public class RoomAvailabilityPicker : TabControl { diff --git a/osu.Game/Screens/Multi/Screens/Match/RoomSettingsOverlay.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs similarity index 98% rename from osu.Game/Screens/Multi/Screens/Match/RoomSettingsOverlay.cs rename to osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs index a599e4e151..1e46faa1cb 100644 --- a/osu.Game/Screens/Multi/Screens/Match/RoomSettingsOverlay.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs @@ -1,13 +1,11 @@ // Copyright (c) 2007-2018 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; -using osu.Framework.Input; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; @@ -16,7 +14,7 @@ using osu.Game.Overlays.SearchableList; using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Screens.Multi.Screens.Match +namespace osu.Game.Screens.Multi.Screens.Match.Settings { public class RoomSettingsOverlay : OverlayContainer {