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

Use Name/NameScreen format

Browse Source
This commit is contained in:
smoogipoo 2018-11-07 13:04:17 +09:00
parent 52f4923c8e
commit e9e50f41fb
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,13 +14,13 @@ namespace osu.Game.Tests.Visual
[TestFixture]
public class TestCaseEditorCompose : EditorClockTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Compose) };
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ComposeScreen) };
[BackgroundDependencyLoader]
private void load()
{
Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
Child = new Compose();
Child = new ComposeScreen();
}
}
}

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

@ -17,7 +17,7 @@ using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Compose
{
[Cached(Type = typeof(IPlacementHandler))]
public class Compose : EditorScreen, IPlacementHandler
public class ComposeScreen : EditorScreen, IPlacementHandler
{
private const float vertical_margins = 10;
private const float horizontal_margins = 20;

4
osu.Game/Screens/Edit/Design/Design.cs → osu.Game/Screens/Edit/Design/DesignScreen.cs
View File

@ -9,9 +9,9 @@ using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Design
{
public class Design : EditorScreen
public class DesignScreen : EditorScreen
{
public Design()
public DesignScreen()
{
Add(new Container
{

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

@ -17,6 +17,8 @@ using osu.Framework.Timing;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Edit.Components;
using osu.Game.Screens.Edit.Components.Menus;
using osu.Game.Screens.Edit.Compose;
using osu.Game.Screens.Edit.Design;
namespace osu.Game.Screens.Edit
{
@ -166,10 +168,10 @@ namespace osu.Game.Screens.Edit
switch (mode)
{
case EditorScreenMode.Compose:
currentScreen = new Compose.Compose();
currentScreen = new ComposeScreen();
break;
case EditorScreenMode.Design:
currentScreen = new Design.Design();
currentScreen = new DesignScreen();
break;
default:
currentScreen = new EditorScreen();