h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Remove intermediate Screens namespace

Browse Source
This commit is contained in:
smoogipoo 2018-11-06 18:28:22 +09:00
parent ac25718c5a
commit 52f4923c8e
35 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs
View File

@ -5,8 +5,8 @@ using System;
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Components;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Compose.Components;
using OpenTK;
namespace osu.Game.Tests.Visual

2
osu.Game.Tests/Visual/TestCaseEditorCompose.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Compose;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual

2
osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
View File

@ -13,7 +13,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
using osu.Game.Screens.Edit.Compose.Components.Timeline;
using OpenTK.Graphics;
namespace osu.Game.Tests.Visual

2
osu.Game.Tests/Visual/TestCaseEditorMenuBar.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Edit.Menus;
using osu.Game.Screens.Edit.Components.Menus;
namespace osu.Game.Tests.Visual
{

4
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -16,8 +16,8 @@ using osu.Game.Rulesets.Osu.Edit;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks.Components;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Components;
using osu.Game.Screens.Edit.Compose;
using osu.Game.Screens.Edit.Compose.Components;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual

2
osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs
View File

@ -5,9 +5,9 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents;
using System;
using System.Collections.Generic;
using osu.Game.Screens.Edit.Setup.Components.LabelledComponents;
namespace osu.Game.Tests.Visual
{

2
osu.Game.Tests/Visual/TestCaseZoomableScrollContainer.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.MathUtils;
using osu.Game.Graphics;
using osu.Game.Graphics.Cursor;
using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
using osu.Game.Screens.Edit.Compose.Components.Timeline;
using OpenTK;
using OpenTK.Graphics;

2
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -17,7 +17,7 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Edit.Components.RadioButtons;
using osu.Game.Screens.Edit.Screens.Compose.Components;
using osu.Game.Screens.Edit.Compose.Components;
namespace osu.Game.Rulesets.Edit
{

2
osu.Game/Rulesets/Edit/PlacementBlueprint.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Compose;
using OpenTK;
namespace osu.Game.Rulesets.Edit

2
osu.Game/Screens/Edit/Screens/Compose/BindableBeatDivisor.cs → osu.Game/Screens/Edit/BindableBeatDivisor.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Linq;
using osu.Framework.Configuration;
namespace osu.Game.Screens.Edit.Screens.Compose
namespace osu.Game.Screens.Edit
{
public class BindableBeatDivisor : BindableNumber<int>
{

7
osu.Game/Screens/Edit/Menus/EditorMenuBar.cs → osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
View File

@ -2,19 +2,18 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
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.Graphics.UserInterface;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Configuration;
using osu.Framework.Input.Events;
using osu.Game.Screens.Edit.Screens;
namespace osu.Game.Screens.Edit.Menus
namespace osu.Game.Screens.Edit.Components.Menus
{
public class EditorMenuBar : OsuMenu
{

2
osu.Game/Screens/Edit/Menus/EditorMenuItem.cs → osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs
View File

@ -4,7 +4,7 @@
using System;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Edit.Menus
namespace osu.Game.Screens.Edit.Components.Menus
{
public class EditorMenuItem : OsuMenuItem
{

2
osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs → osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Screens.Edit.Menus
namespace osu.Game.Screens.Edit.Components.Menus
{
public class EditorMenuItemSpacer : EditorMenuItem
{

5
osu.Game/Screens/Edit/Menus/ScreenSelectionTabControl.cs → osu.Game/Screens/Edit/Components/Menus/ScreenSelectionTabControl.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
@ -9,10 +8,10 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Edit.Screens;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Menus
namespace osu.Game.Screens.Edit.Components.Menus
{
public class ScreenSelectionTabControl : OsuTabControl<EditorScreenMode>
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/BeatDivisorControl.cs → osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
View File

@ -19,7 +19,7 @@ using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
namespace osu.Game.Screens.Edit.Screens.Compose.Components
namespace osu.Game.Screens.Edit.Compose.Components
{
public class BeatDivisorControl : CompositeDrawable
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/BlueprintContainer.cs → osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Components
namespace osu.Game.Screens.Edit.Compose.Components
{
public class BlueprintContainer : CompositeDrawable
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/DragBox.cs → osu.Game/Screens/Edit/Compose/Components/DragBox.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Components
namespace osu.Game.Screens.Edit.Compose.Components
{
/// <summary>
/// A box that displays the drag selection and provides selection events for users to handle.

2
osu.Game/Screens/Edit/Screens/Compose/Components/EditorPlayfieldBorder.cs → osu.Game/Screens/Edit/Compose/Components/EditorPlayfieldBorder.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Components
namespace osu.Game.Screens.Edit.Compose.Components
{
/// <summary>
/// Provides a border around the playfield.

2
osu.Game/Screens/Edit/Screens/Compose/Components/SelectionBox.cs → osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
View File

@ -16,7 +16,7 @@ using osu.Game.Rulesets.Edit.Types;
using OpenTK;
using OpenTK.Input;
namespace osu.Game.Screens.Edit.Screens.Compose.Components
namespace osu.Game.Screens.Edit.Compose.Components
{
/// <summary>
/// A box which surrounds <see cref="SelectionBlueprint"/>s and provides interactive handles, context menus etc.

2
osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/CentreMarker.cs → osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
public class CentreMarker : CompositeDrawable
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/Timeline.cs → osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
View File

@ -12,7 +12,7 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
public class Timeline : ZoomableScrollContainer
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/TimelineArea.cs → osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
public class TimelineArea : CompositeDrawable
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/TimelineButton.cs → osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
public class TimelineButton : CompositeDrawable
{

2
osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/ZoomableScrollContainer.cs → osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
View File

@ -9,7 +9,7 @@ using osu.Framework.Input.Events;
using osu.Framework.MathUtils;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
public class ZoomableScrollContainer : ScrollContainer
{

8
osu.Game/Screens/Edit/Screens/Compose/Compose.cs → osu.Game/Screens/Edit/Compose/Compose.cs
View File

@ -3,7 +3,6 @@
using JetBrains.Annotations;
using osu.Framework.Allocation;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -11,10 +10,11 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Screens.Compose.Components;
using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
using osu.Game.Screens.Edit.Compose.Components;
using osu.Game.Screens.Edit.Compose.Components.Timeline;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose
namespace osu.Game.Screens.Edit.Compose
{
[Cached(Type = typeof(IPlacementHandler))]
public class Compose : EditorScreen, IPlacementHandler

2
osu.Game/Screens/Edit/Screens/Compose/IPlacementHandler.cs → osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
View File

@ -3,7 +3,7 @@
using osu.Game.Rulesets.Objects;
namespace osu.Game.Screens.Edit.Screens.Compose
namespace osu.Game.Screens.Edit.Compose
{
public interface IPlacementHandler
{

2
osu.Game/Screens/Edit/Screens/Design/Design.cs → osu.Game/Screens/Edit/Design/Design.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Sprites;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Design
namespace osu.Game.Screens.Edit.Design
{
public class Design : EditorScreen
{

9
osu.Game/Screens/Edit/Editor.cs
View File

@ -8,7 +8,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Screens.Edit.Menus;
using osu.Game.Screens.Edit.Components.Timelines.Summary;
using osu.Framework.Allocation;
using osu.Framework.Graphics.UserInterface;
@ -16,10 +15,8 @@ using osu.Framework.Input.Events;
using osu.Framework.Platform;
using osu.Framework.Timing;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Edit.Screens;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Design;
using osu.Game.Screens.Edit.Components;
using osu.Game.Screens.Edit.Components.Menus;
namespace osu.Game.Screens.Edit
{
@ -169,10 +166,10 @@ namespace osu.Game.Screens.Edit
switch (mode)
{
case EditorScreenMode.Compose:
currentScreen = new Compose();
currentScreen = new Compose.Compose();
break;
case EditorScreenMode.Design:
currentScreen = new Design();
currentScreen = new Design.Design();
break;
default:
currentScreen = new EditorScreen();

1
osu.Game/Screens/Edit/EditorClock.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.MathUtils;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Screens.Edit.Screens.Compose;
using OpenTK;
namespace osu.Game.Screens.Edit

2
osu.Game/Screens/Edit/Screens/EditorScreen.cs → osu.Game/Screens/Edit/EditorScreen.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
namespace osu.Game.Screens.Edit.Screens
namespace osu.Game.Screens.Edit
{
/// <summary>
/// TODO: eventually make this inherit Screen and add a local scren stack inside the Editor.

2
osu.Game/Screens/Edit/Screens/EditorScreenMode.cs → osu.Game/Screens/Edit/EditorScreenMode.cs
View File

@ -3,7 +3,7 @@
using System.ComponentModel;
namespace osu.Game.Screens.Edit.Screens
namespace osu.Game.Screens.Edit
{
public enum EditorScreenMode
{

4
osu.Game/Screens/Edit/Screens/Setup/Components/LabelledComponents/LabelledTextBox.cs → osu.Game/Screens/Edit/Setup/Components/LabelledComponents/LabelledTextBox.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@ -10,8 +9,9 @@ using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
namespace osu.Game.Screens.Edit.Setup.Components.LabelledComponents
{
public class LabelledTextBox : CompositeDrawable
{

1
osu.Game/Tests/Visual/EditorClockTestCase.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Screens.Compose;
namespace osu.Game.Tests.Visual
{

1
osu.Game/Tests/Visual/EditorTestCase.cs
View File

@ -6,7 +6,6 @@ using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Game.Rulesets;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Screens;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual

2
osu.Game/Tests/Visual/PlacementBlueprintTestCase.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Timing;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Compose;
namespace osu.Game.Tests.Visual
{