sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-22 22:17:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5875 from Joehuu/fix-gameplay-menu-button-hover-ani

Browse Source 
Fix gameplay menu button initial hover animation

Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Dean Herbert 2019-09-04 12:26:52 +09:00 committed by GitHub
commit aad245c4e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 129 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
View File

@ -3,12 +3,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osuTK; using osuTK;
@ -16,7 +17,7 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.Gameplay namespace osu.Game.Tests.Visual.Gameplay
{ {
[Description("player pause/fail screens")] [System.ComponentModel.Description("player pause/fail screens")]
public class TestSceneGameplayMenuOverlay : ManualInputManagerTestScene public class TestSceneGameplayMenuOverlay : ManualInputManagerTestScene
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseOverlay) }; public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseOverlay) };
@ -29,57 +30,118 @@ namespace osu.Game.Tests.Visual.Gameplay
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase game) private void load(OsuGameBase game)
{ {
Child = globalActionContainer = new GlobalActionContainer(game) Child = globalActionContainer = new GlobalActionContainer(game);
{ }
Children = new Drawable[]
{
pauseOverlay = new PauseOverlay
{
OnResume = () => Logger.Log(@"Resume"),
OnRetry = () => Logger.Log(@"Retry"),
OnQuit = () => Logger.Log(@"Quit"),
},
failOverlay = new FailOverlay
{ [SetUp]
OnRetry = () => Logger.Log(@"Retry"), public void SetUp() => Schedule(() =>
OnQuit = () => Logger.Log(@"Quit"), {
} globalActionContainer.Children = new Drawable[]
{
pauseOverlay = new PauseOverlay
{
OnResume = () => Logger.Log(@"Resume"),
OnRetry = () => Logger.Log(@"Retry"),
OnQuit = () => Logger.Log(@"Quit"),
},
failOverlay = new FailOverlay
{
OnRetry = () => Logger.Log(@"Retry"),
OnQuit = () => Logger.Log(@"Quit"),
} }
}; };
InputManager.MoveMouseTo(Vector2.Zero);
});
[Test]
public void TestAdjustRetryCount()
{
showOverlay();
var retryCount = 0; var retryCount = 0;
AddStep("Add retry", () => AddRepeatStep("Add retry", () =>
{ {
retryCount++; retryCount++;
pauseOverlay.Retries = failOverlay.Retries = retryCount; pauseOverlay.Retries = failOverlay.Retries = retryCount;
}); }, 10);
}
AddToggleStep("Toggle pause overlay", t => pauseOverlay.ToggleVisibility()); /// <summary>
AddToggleStep("Toggle fail overlay", t => failOverlay.ToggleVisibility()); /// Tests that pressing enter after an overlay shows doesn't trigger an event because a selection hasn't occurred.
/// </summary>
[Test]
public void TestEnterWithoutSelection()
{
showOverlay();
testHideResets(); AddStep("Press select", () => press(GlobalAction.Select));
AddAssert("Overlay still open", () => pauseOverlay.State.Value == Visibility.Visible);
}
testEnterWithoutSelection(); /// <summary>
testKeyUpFromInitial(); /// Tests that pressing the up arrow from the initial state selects the last button.
testKeyDownFromInitial(); /// </summary>
testKeyUpWrapping(); [Test]
testKeyDownWrapping(); public void TestKeyUpFromInitial()
{
showOverlay();
testMouseSelectionAfterKeySelection(); AddStep("Up arrow", () => press(Key.Up));
testKeySelectionAfterMouseSelection(); AddAssert("Last button selected", () => pauseOverlay.Buttons.Last().Selected.Value);
}
testMouseDeselectionResets(); /// <summary>
/// Tests that pressing the down arrow from the initial state selects the first button.
/// </summary>
[Test]
public void TestKeyDownFromInitial()
{
showOverlay();
testClickSelection(); AddStep("Down arrow", () => press(Key.Down));
testEnterKeySelection(); AddAssert("First button selected", () => getButton(0).Selected.Value);
}
/// <summary>
/// Tests that pressing the up arrow repeatedly causes the selected button to wrap correctly.
/// </summary>
[Test]
public void TestKeyUpWrapping()
{
AddStep("Show overlay", () => failOverlay.Show());
AddStep("Up arrow", () => press(Key.Up));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
AddStep("Up arrow", () => press(Key.Up));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
AddStep("Up arrow", () => press(Key.Up));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
}
/// <summary>
/// Tests that pressing the down arrow repeatedly causes the selected button to wrap correctly.
/// </summary>
[Test]
public void TestKeyDownWrapping()
{
AddStep("Show overlay", () => failOverlay.Show());
AddStep("Down arrow", () => press(Key.Down));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
AddStep("Down arrow", () => press(Key.Down));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
AddStep("Down arrow", () => press(Key.Down));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
} }
/// <summary> /// <summary>
/// Test that hiding the overlay after hovering a button will reset the overlay to the initial state with no buttons selected. /// Test that hiding the overlay after hovering a button will reset the overlay to the initial state with no buttons selected.
/// </summary> /// </summary>
private void testHideResets() [Test]
public void TestHideResets()
{ {
AddStep("Show overlay", () => failOverlay.Show()); AddStep("Show overlay", () => failOverlay.Show());
@ -90,141 +152,73 @@ namespace osu.Game.Tests.Visual.Gameplay
} }
/// <summary> /// <summary>
/// Tests that pressing enter after an overlay shows doesn't trigger an event because a selection hasn't occurred. /// Tests that entering menu with cursor initially on button selects it.
/// </summary> /// </summary>
private void testEnterWithoutSelection() [Test]
public void TestInitialButtonHover()
{ {
AddStep("Show overlay", () => pauseOverlay.Show()); showOverlay();
AddStep("Press select", () => press(GlobalAction.Select)); AddStep("Hover first button", () => InputManager.MoveMouseTo(getButton(0)));
AddAssert("Overlay still open", () => pauseOverlay.State.Value == Visibility.Visible);
AddStep("Hide overlay", () => pauseOverlay.Hide()); AddStep("Hide overlay", () => pauseOverlay.Hide());
} showOverlay();
/// <summary> AddAssert("First button selected", () => getButton(0).Selected.Value);
/// Tests that pressing the up arrow from the initial state selects the last button.
/// </summary>
private void testKeyUpFromInitial()
{
AddStep("Show overlay", () => pauseOverlay.Show());
AddStep("Up arrow", () => press(Key.Up));
AddAssert("Last button selected", () => pauseOverlay.Buttons.Last().Selected.Value);
AddStep("Hide overlay", () => pauseOverlay.Hide());
}
/// <summary>
/// Tests that pressing the down arrow from the initial state selects the first button.
/// </summary>
private void testKeyDownFromInitial()
{
AddStep("Show overlay", () => pauseOverlay.Show());
AddStep("Down arrow", () => press(Key.Down));
AddAssert("First button selected", () => pauseOverlay.Buttons.First().Selected.Value);
AddStep("Hide overlay", () => pauseOverlay.Hide());
}
/// <summary>
/// Tests that pressing the up arrow repeatedly causes the selected button to wrap correctly.
/// </summary>
private void testKeyUpWrapping()
{
AddStep("Show overlay", () => failOverlay.Show());
AddStep("Up arrow", () => press(Key.Up));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
AddStep("Up arrow", () => press(Key.Up));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
AddStep("Up arrow", () => press(Key.Up));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
AddStep("Hide overlay", () => failOverlay.Hide());
}
/// <summary>
/// Tests that pressing the down arrow repeatedly causes the selected button to wrap correctly.
/// </summary>
private void testKeyDownWrapping()
{
AddStep("Show overlay", () => failOverlay.Show());
AddStep("Down arrow", () => press(Key.Down));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
AddStep("Down arrow", () => press(Key.Down));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
AddStep("Down arrow", () => press(Key.Down));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
AddStep("Hide overlay", () => failOverlay.Hide());
} }
/// <summary> /// <summary>
/// Tests that hovering a button that was previously selected with the keyboard correctly selects the new button and deselects the previous button. /// Tests that hovering a button that was previously selected with the keyboard correctly selects the new button and deselects the previous button.
/// </summary> /// </summary>
private void testMouseSelectionAfterKeySelection() [Test]
public void TestMouseSelectionAfterKeySelection()
{ {
AddStep("Show overlay", () => pauseOverlay.Show()); showOverlay();
var secondButton = pauseOverlay.Buttons.Skip(1).First();
AddStep("Down arrow", () => press(Key.Down)); AddStep("Down arrow", () => press(Key.Down));
AddStep("Hover second button", () => InputManager.MoveMouseTo(secondButton)); AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
AddAssert("First button not selected", () => !pauseOverlay.Buttons.First().Selected.Value); AddAssert("First button not selected", () => !getButton(0).Selected.Value);
AddAssert("Second button selected", () => secondButton.Selected.Value); AddAssert("Second button selected", () => getButton(1).Selected.Value);
AddStep("Hide overlay", () => pauseOverlay.Hide());
} }
/// <summary> /// <summary>
/// Tests that pressing a key after selecting a button with a hover event correctly selects a new button and deselects the previous button. /// Tests that pressing a key after selecting a button with a hover event correctly selects a new button and deselects the previous button.
/// </summary> /// </summary>
private void testKeySelectionAfterMouseSelection() [Test]
public void TestKeySelectionAfterMouseSelection()
{ {
AddStep("Show overlay", () => AddStep("Show overlay", () =>
{ {
pauseOverlay.Show(); pauseOverlay.Show();
InputManager.MoveMouseTo(Vector2.Zero);
}); });
var secondButton = pauseOverlay.Buttons.Skip(1).First(); AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
AddStep("Hover second button", () => InputManager.MoveMouseTo(secondButton));
AddStep("Up arrow", () => press(Key.Up)); AddStep("Up arrow", () => press(Key.Up));
AddAssert("Second button not selected", () => !secondButton.Selected.Value); AddAssert("Second button not selected", () => !getButton(1).Selected.Value);
AddAssert("First button selected", () => pauseOverlay.Buttons.First().Selected.Value); AddAssert("First button selected", () => getButton(0).Selected.Value);
AddStep("Hide overlay", () => pauseOverlay.Hide());
} }
/// <summary> /// <summary>
/// Tests that deselecting with the mouse by losing hover will reset the overlay to the initial state. /// Tests that deselecting with the mouse by losing hover will reset the overlay to the initial state.
/// </summary> /// </summary>
private void testMouseDeselectionResets() [Test]
public void TestMouseDeselectionResets()
{ {
AddStep("Show overlay", () => pauseOverlay.Show()); showOverlay();
var secondButton = pauseOverlay.Buttons.Skip(1).First(); AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
AddStep("Hover second button", () => InputManager.MoveMouseTo(secondButton));
AddStep("Unhover second button", () => InputManager.MoveMouseTo(Vector2.Zero)); AddStep("Unhover second button", () => InputManager.MoveMouseTo(Vector2.Zero));
AddStep("Down arrow", () => press(Key.Down)); AddStep("Down arrow", () => press(Key.Down));
AddAssert("First button selected", () => pauseOverlay.Buttons.First().Selected.Value); // Initial state condition AddAssert("First button selected", () => getButton(0).Selected.Value); // Initial state condition
AddStep("Hide overlay", () => pauseOverlay.Hide());
} }
/// <summary> /// <summary>
/// Tests that clicking on a button correctly causes a click event for that button. /// Tests that clicking on a button correctly causes a click event for that button.
/// </summary> /// </summary>
private void testClickSelection() [Test]
public void TestClickSelection()
{ {
AddStep("Show overlay", () => pauseOverlay.Show()); showOverlay();
var retryButton = pauseOverlay.Buttons.Skip(1).First();
bool triggered = false; bool triggered = false;
AddStep("Click retry button", () => AddStep("Click retry button", () =>
@ -232,7 +226,7 @@ namespace osu.Game.Tests.Visual.Gameplay
var lastAction = pauseOverlay.OnRetry; var lastAction = pauseOverlay.OnRetry;
pauseOverlay.OnRetry = () => triggered = true; pauseOverlay.OnRetry = () => triggered = true;
retryButton.Click(); getButton(1).Click();
pauseOverlay.OnRetry = lastAction; pauseOverlay.OnRetry = lastAction;
}); });
@ -243,9 +237,10 @@ namespace osu.Game.Tests.Visual.Gameplay
/// <summary> /// <summary>
/// Tests that pressing the enter key with a button selected correctly causes a click event for that button. /// Tests that pressing the enter key with a button selected correctly causes a click event for that button.
/// </summary> /// </summary>
private void testEnterKeySelection() [Test]
public void TestEnterKeySelection()
{ {
AddStep("Show overlay", () => pauseOverlay.Show()); showOverlay();
AddStep("Select second button", () => AddStep("Select second button", () =>
{ {
@ -275,6 +270,10 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("Overlay is closed", () => pauseOverlay.State.Value == Visibility.Hidden); AddAssert("Overlay is closed", () => pauseOverlay.State.Value == Visibility.Hidden);
} }
private void showOverlay() => AddStep("Show overlay", () => pauseOverlay.Show());
private DialogButton getButton(int index) => pauseOverlay.Buttons.Skip(index).First();
private void press(Key key) private void press(Key key)
{ {
InputManager.PressKey(key); InputManager.PressKey(key);

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

@ -304,8 +304,6 @@ namespace osu.Game.Screens.Play
private class Button : DialogButton private class Button : DialogButton
{ {
protected override bool OnHover(HoverEvent e) => true;
protected override bool OnMouseMove(MouseMoveEvent e) protected override bool OnMouseMove(MouseMoveEvent e)
{ {
Selected.Value = true; Selected.Value = true;