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

Merge pull request #18737 from frenzibyte/fix-up-down

Browse Source 
Fix toolbar music button handling keys while not hovered
This commit is contained in:
Bartłomiej Dach 2022-06-16 22:29:35 +02:00 committed by GitHub
commit b74bb83176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
View File

@ -17,6 +17,7 @@ using osu.Game.Overlays;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
using osu.Game.Overlays.Toolbar; using osu.Game.Overlays.Toolbar;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using osuTK.Input; using osuTK.Input;
@ -153,11 +154,23 @@ namespace osu.Game.Tests.Visual.Menus
AddStep("hover toolbar music button", () => InputManager.MoveMouseTo(this.ChildrenOfType<ToolbarMusicButton>().Single())); AddStep("hover toolbar music button", () => InputManager.MoveMouseTo(this.ChildrenOfType<ToolbarMusicButton>().Single()));
AddStep("reset volume", () => Audio.Volume.Value = 1); AddStep("reset volume", () => Audio.Volume.Value = 1);
AddStep("hide volume overlay", () => volumeOverlay.Hide());
AddRepeatStep("scroll down", () => InputManager.ScrollVerticalBy(-10), 5); AddRepeatStep("scroll down", () => InputManager.ScrollVerticalBy(-10), 5);
AddAssert("volume lowered down", () => Audio.Volume.Value < 1); AddAssert("volume lowered down", () => Audio.Volume.Value < 1);
AddRepeatStep("scroll up", () => InputManager.ScrollVerticalBy(10), 5); AddRepeatStep("scroll up", () => InputManager.ScrollVerticalBy(10), 5);
AddAssert("volume raised up", () => Audio.Volume.Value == 1); AddAssert("volume raised up", () => Audio.Volume.Value == 1);
AddStep("move mouse away", () => InputManager.MoveMouseTo(Vector2.Zero));
AddAssert("button not hovered", () => !this.ChildrenOfType<ToolbarMusicButton>().Single().IsHovered);
AddStep("set volume to 0.5", () => Audio.Volume.Value = 0.5);
AddStep("hide volume overlay", () => volumeOverlay.Hide());
AddRepeatStep("scroll down", () => InputManager.ScrollVerticalBy(-10), 5);
AddAssert("volume not changed", () => Audio.Volume.Value == 0.5);
AddRepeatStep("scroll up", () => InputManager.ScrollVerticalBy(10), 5);
AddAssert("volume not changed", () => Audio.Volume.Value == 0.5);
} }
[Test] [Test]
@ -166,11 +179,24 @@ namespace osu.Game.Tests.Visual.Menus
AddStep("hover toolbar music button", () => InputManager.MoveMouseTo(this.ChildrenOfType<ToolbarMusicButton>().Single())); AddStep("hover toolbar music button", () => InputManager.MoveMouseTo(this.ChildrenOfType<ToolbarMusicButton>().Single()));
AddStep("reset volume", () => Audio.Volume.Value = 1); AddStep("reset volume", () => Audio.Volume.Value = 1);
AddStep("hide volume overlay", () => volumeOverlay.Hide());
AddRepeatStep("arrow down", () => InputManager.Key(Key.Down), 5); AddRepeatStep("arrow down", () => InputManager.Key(Key.Down), 5);
AddAssert("volume lowered down", () => Audio.Volume.Value < 1); AddAssert("volume lowered down", () => Audio.Volume.Value < 1);
AddRepeatStep("arrow up", () => InputManager.Key(Key.Up), 5); AddRepeatStep("arrow up", () => InputManager.Key(Key.Up), 5);
AddAssert("volume raised up", () => Audio.Volume.Value == 1); AddAssert("volume raised up", () => Audio.Volume.Value == 1);
AddStep("hide volume overlay", () => volumeOverlay.Hide());
AddStep("move mouse away", () => InputManager.MoveMouseTo(Vector2.Zero));
AddAssert("button not hovered", () => !this.ChildrenOfType<ToolbarMusicButton>().Single().IsHovered);
AddStep("set volume", () => Audio.Volume.Value = 0.5);
AddStep("hide volume overlay", () => volumeOverlay.Hide());
AddRepeatStep("arrow down", () => InputManager.Key(Key.Down), 5);
AddAssert("volume not changed", () => Audio.Volume.Value == 0.5);
AddRepeatStep("arrow up", () => InputManager.Key(Key.Up), 5);
AddAssert("volume not changed", () => Audio.Volume.Value == 0.5);
} }
public class TestToolbar : Toolbar public class TestToolbar : Toolbar

3
osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
View File

@ -81,6 +81,9 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)
{ {
if (!IsHovered)
return false;
switch (e.Key) switch (e.Key)
{ {
case Key.Up: case Key.Up: