h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-20 19:40:38 +08:00
Code Issues Releases Wiki Activity

update to new API

Browse Source
This commit is contained in:
Lena
2025-02-21 12:42:26 +01:00
Unverified
parent d8d695242e
commit 6b693ca151
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Desktop/OsuGameDesktop.cs
+1 -2
View File
@@ -128,8 +128,7 @@ namespace osu.Desktop
LoadComponentAsync(new ElevatedPrivilegesChecker(), Add);
if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
LoadComponentAsync(new BossKeyManager(), Add);
LoadComponentAsync(new BossKeyManager(), Add);
osuSchemeLinkIPCChannel = new OsuSchemeLinkIPCChannel(Host, this);
archiveImportIPCChannel = new ArchiveImportIPCChannel(Host, this);
osu.Desktop/Platform/BossKeyManager.cs
+38 -7
View File
@@ -2,11 +2,13 @@ using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Framework.Allocation;
using osu.Framework.Platform;
using osu.Framework.Platform.SDL3;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Input.Bindings;
using osu.Game.Overlays;
using osu.Framework.Logging;
using System;
namespace osu.Desktop.Platform
{
@@ -18,6 +20,8 @@ namespace osu.Desktop.Platform
[Resolved]
private VolumeOverlay volumeOverlay { get; set; } = null!;
private IDisposable? activeTrayIcon = null!;
[BackgroundDependencyLoader]
private void load()
{
@@ -27,14 +31,40 @@ namespace osu.Desktop.Platform
{
if (e.Action == GlobalAction.BossKey && !e.Repeat)
{
host.Window.Hide();
bool previousState = volumeOverlay.IsMuted.Value;
host.Window.CreateNotificationTrayIcon("osu!", () => Schedule(() => onShow(previousState)));
Logger.Log($"Created notification tray icon");
volumeOverlay.IsMuted.Value = true;
return true;
if (host.Window is ISDLWindow window)
{
// TODO: add icon
var icon = new TrayIcon
{
Label = "osu!",
Menu = new TrayMenuEntry[]
{
new TrayButton
{
Label = "Open osu!",
Action = () => Schedule(() => onShow(previousState)),
},
}
};
try
{
Schedule(() => { activeTrayIcon = window.CreateTrayIcon(icon); });
}
catch (PlatformNotSupportedException ex)
{
Logger.Log($"aaaa");
return false;
}
host.Window.Hide();
Logger.Log($"Created notification tray icon");
volumeOverlay.IsMuted.Value = true;
return true;
}
}
return false;
@@ -45,7 +75,8 @@ namespace osu.Desktop.Platform
Logger.Log($"Notification tray icon clicked");
host.Window.Show();
host.Window.Raise();
host.Window.RemoveNotificationTrayIcon();
activeTrayIcon.Dispose();
Logger.Log($"Notification tray icon removed");
volumeOverlay.IsMuted.Value = previousState;
}