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

Allow dismissing notifications without performing action using middle / right click

Browse Source
This commit is contained in:
Dean Herbert 2022-09-10 14:10:49 +09:00
parent 7f5fe56c1d
commit efe3b1aa7b
2 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
View File

@ -12,11 +12,13 @@ using osu.Framework.Utils;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
using osuTK;
using osuTK.Input;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
[TestFixture] [TestFixture]
public class TestSceneNotificationOverlay : OsuTestScene public class TestSceneNotificationOverlay : OsuManualInputManagerTestScene
{ {
private NotificationOverlay notificationOverlay = null!; private NotificationOverlay notificationOverlay = null!;
@ -32,7 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
TimeToCompleteProgress = 2000; TimeToCompleteProgress = 2000;
progressingNotifications.Clear(); progressingNotifications.Clear();
Content.Children = new Drawable[] Children = new Drawable[]
{ {
notificationOverlay = new NotificationOverlay notificationOverlay = new NotificationOverlay
{ {
@ -45,6 +47,60 @@ namespace osu.Game.Tests.Visual.UserInterface
notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; }; notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
}); });
[Test]
public void TestDismissWithoutActivationRightClick()
{
bool activated = false;
SimpleNotification notification = null!;
AddStep("post", () =>
{
activated = false;
notificationOverlay.Post(notification = new SimpleNotification
{
Text = @"Welcome to osu!. Enjoy your stay!",
Activated = () => activated = true,
});
});
AddStep("click to activate", () =>
{
InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
InputManager.Click(MouseButton.Right);
});
AddUntilStep("wait for closed", () => notification.WasClosed);
AddAssert("was not activated", () => !activated);
AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
}
[Test]
public void TestActivate()
{
bool activated = false;
SimpleNotification notification = null!;
AddStep("post", () =>
{
activated = false;
notificationOverlay.Post(notification = new SimpleNotification
{
Text = @"Welcome to osu!. Enjoy your stay!",
Activated = () => activated = true,
});
});
AddStep("click to activate", () =>
{
InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
InputManager.Click(MouseButton.Left);
});
AddUntilStep("wait for closed", () => notification.WasClosed);
AddAssert("was activated", () => activated);
AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
}
[Test] [Test]
public void TestPresence() public void TestPresence()
{ {

19
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -16,6 +16,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Overlays.Notifications namespace osu.Game.Overlays.Notifications
{ {
@ -170,11 +171,25 @@ namespace osu.Game.Overlays.Notifications
base.OnHoverLost(e); base.OnHoverLost(e);
} }
protected override bool OnMouseDown(MouseDownEvent e)
{
// right click doesn't trigger OnClick so we need to handle here until that changes.
if (e.Button != MouseButton.Left)
{
Close();
return true;
}
return base.OnMouseDown(e);
}
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)
{ {
if (Activated?.Invoke() ?? true) // Clicking with anything but left button should dismiss but not perform the activation action.
Close(); if (e.Button == MouseButton.Left)
Activated?.Invoke();
Close();
return true; return true;
} }