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

MenuOverlay -> GameplayMenuOverlay

Browse Source
This commit is contained in:
smoogipoo 2017-12-18 16:40:50 +09:00
parent cf640d084e
commit 918e7c9a4b
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/TestCaseMenuOverlay.cs → osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
View File

@ -11,11 +11,11 @@ using osu.Game.Screens.Play;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[Description("player pause/fail screens")] [Description("player pause/fail screens")]
internal class TestCaseMenuOverlay : OsuTestCase internal class TestCaseGameplayMenuOverlay : OsuTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseContainer) }; public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseContainer) };
public TestCaseMenuOverlay() public TestCaseGameplayMenuOverlay()
{ {
FailOverlay failOverlay; FailOverlay failOverlay;
PauseContainer.PauseOverlay pauseOverlay; PauseContainer.PauseOverlay pauseOverlay;

2
osu.Game.Tests/osu.Game.Tests.csproj
View File

@ -120,7 +120,7 @@
<Compile Include="Visual\TestCaseLeaderboard.cs" /> <Compile Include="Visual\TestCaseLeaderboard.cs" />
<Compile Include="Visual\TestCaseMedalOverlay.cs" /> <Compile Include="Visual\TestCaseMedalOverlay.cs" />
<Compile Include="Visual\TestCaseButtonSystem.cs" /> <Compile Include="Visual\TestCaseButtonSystem.cs" />
<Compile Include="Visual\TestCaseMenuOverlay.cs" /> <Compile Include="Visual\TestCaseGameplayMenuOverlay.cs" />
<Compile Include="Visual\TestCaseMods.cs" /> <Compile Include="Visual\TestCaseMods.cs" />
<Compile Include="Visual\TestCaseMusicController.cs" /> <Compile Include="Visual\TestCaseMusicController.cs" />
<Compile Include="Visual\TestCaseNotificationOverlay.cs" /> <Compile Include="Visual\TestCaseNotificationOverlay.cs" />

2
osu.Game/Screens/Play/FailOverlay.cs
View File

@ -10,7 +10,7 @@ using System.Linq;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public class FailOverlay : MenuOverlay public class FailOverlay : GameplayMenuOverlay
{ {
public override string Header => "failed"; public override string Header => "failed";
public override string Description => "you're dead, try again?"; public override string Description => "you're dead, try again?";

8
osu.Game/Screens/Play/MenuOverlay.cs → osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -17,7 +17,7 @@ using OpenTK.Input;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public abstract class MenuOverlay : OverlayContainer, IRequireHighFrequencyMousePosition public abstract class GameplayMenuOverlay : OverlayContainer, IRequireHighFrequencyMousePosition
{ {
private const int transition_duration = 200; private const int transition_duration = 200;
private const int button_height = 70; private const int button_height = 70;
@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
private FillFlowContainer retryCounterContainer; private FillFlowContainer retryCounterContainer;
protected MenuOverlay() protected GameplayMenuOverlay()
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
@ -175,7 +175,7 @@ namespace osu.Game.Screens.Play
protected void AddButton(string text, Color4 colour, Action action) protected void AddButton(string text, Color4 colour, Action action)
{ {
var button = new MenuOverlayButton var button = new Button
{ {
Text = text, Text = text,
ButtonColour = colour, ButtonColour = colour,
@ -247,7 +247,7 @@ namespace osu.Game.Screens.Play
selectionIndex = Buttons.IndexOf(button); selectionIndex = Buttons.IndexOf(button);
} }
private class MenuOverlayButton : DialogButton private class Button : DialogButton
{ {
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{ {

2
osu.Game/Screens/Play/PauseContainer.cs
View File

@ -119,7 +119,7 @@ namespace osu.Game.Screens.Play
base.Update(); base.Update();
} }
public class PauseOverlay : MenuOverlay public class PauseOverlay : GameplayMenuOverlay
{ {
public Action OnResume; public Action OnResume;

2
osu.Game/osu.Game.csproj
View File

@ -719,7 +719,7 @@
<Compile Include="Screens\Play\KeyCounterCollection.cs" /> <Compile Include="Screens\Play\KeyCounterCollection.cs" />
<Compile Include="Screens\Play\KeyCounterKeyboard.cs" /> <Compile Include="Screens\Play\KeyCounterKeyboard.cs" />
<Compile Include="Screens\Play\KeyCounterMouse.cs" /> <Compile Include="Screens\Play\KeyCounterMouse.cs" />
<Compile Include="Screens\Play\MenuOverlay.cs" /> <Compile Include="Screens\Play\GameplayMenuOverlay.cs" />
<Compile Include="Screens\Play\PauseContainer.cs" /> <Compile Include="Screens\Play\PauseContainer.cs" />
<Compile Include="Screens\Play\Player.cs" /> <Compile Include="Screens\Play\Player.cs" />
<Compile Include="Screens\Play\PlayerLoader.cs" /> <Compile Include="Screens\Play\PlayerLoader.cs" />