From 1ecff1b32cfddbaba4d6ea4eb74835195689474f Mon Sep 17 00:00:00 2001 From: Andrey Zavadskiy Date: Sat, 1 Apr 2017 21:50:25 +0300 Subject: [PATCH] Fix naming and testcase --- osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs | 6 +++--- osu.Game/Screens/Play/FailOverlay.cs | 4 ++-- osu.Game/Screens/Play/InGameOverlay.cs | 8 ++++---- osu.Game/Screens/Play/PauseOverlay.cs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs b/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs index 48ab4c47eb..ca59c9faeb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs @@ -38,21 +38,21 @@ namespace osu.Desktop.VisualTests.Tests Add(pauseOverlay); Add(failOverlay); - AddToggleStep(@"Pause", delegate { + AddStep(@"Pause", delegate { if(failOverlay.State == Visibility.Visible) { failOverlay.Hide(); } pauseOverlay.Show(); }); - AddToggleStep("Fail", delegate { + AddStep("Fail", delegate { if (pauseOverlay.State == Visibility.Visible) { pauseOverlay.Hide(); } failOverlay.Show(); }); - AddToggleStep("Add Retry", delegate + AddStep("Add Retry", delegate { retryCount++; pauseOverlay.Retries = retryCount; diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs index 6ae0292cda..c8539dc475 100644 --- a/osu.Game/Screens/Play/FailOverlay.cs +++ b/osu.Game/Screens/Play/FailOverlay.cs @@ -31,8 +31,8 @@ namespace osu.Game.Screens.Play public FailOverlay() { - title = @"failed"; - description = @"you're dead, try again?"; + Title = @"failed"; + Description = @"you're dead, try again?"; } } } diff --git a/osu.Game/Screens/Play/InGameOverlay.cs b/osu.Game/Screens/Play/InGameOverlay.cs index 6a8d7a21ca..db46e00752 100644 --- a/osu.Game/Screens/Play/InGameOverlay.cs +++ b/osu.Game/Screens/Play/InGameOverlay.cs @@ -27,8 +27,8 @@ namespace osu.Game.Screens.Play public Action OnRetry; public Action OnQuit; - protected string title; - protected string description; + protected string Title; + protected string Description; private FillFlowContainer buttons; @@ -131,7 +131,7 @@ namespace osu.Game.Screens.Play { new OsuSpriteText { - Text = title, + Text = Title, Font = @"Exo2.0-Medium", Spacing = new Vector2(5, 0), Origin = Anchor.TopCentre, @@ -143,7 +143,7 @@ namespace osu.Game.Screens.Play }, new OsuSpriteText { - Text = description, + Text = Description, Origin = Anchor.TopCentre, Anchor = Anchor.TopCentre, Shadow = true, diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs index 27c3b25d02..2a67662298 100644 --- a/osu.Game/Screens/Play/PauseOverlay.cs +++ b/osu.Game/Screens/Play/PauseOverlay.cs @@ -35,8 +35,8 @@ namespace osu.Game.Screens.Play public PauseOverlay() { - title = @"paused"; - description = @"you're not going to do what i think you're going to do, are ya?"; + Title = @"paused"; + Description = @"you're not going to do what i think you're going to do, are ya?"; } } }