sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-24 04:38:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10297 from swoolcock/sdl-icon

Browse Source
This commit is contained in:
Dean Herbert 2020-10-19 19:24:10 +09:00 committed by GitHub
commit 1b2991039d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Desktop/OsuGameDesktop.cs
View File

@ -125,12 +125,14 @@ namespace osu.Desktop
{ {
base.SetHost(host); base.SetHost(host);
var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
switch (host.Window) switch (host.Window)
{ {
// Legacy osuTK DesktopGameWindow // Legacy osuTK DesktopGameWindow
case DesktopGameWindow desktopGameWindow: case DesktopGameWindow desktopGameWindow:
desktopGameWindow.CursorState |= CursorState.Hidden; desktopGameWindow.CursorState |= CursorState.Hidden;
desktopGameWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico")); desktopGameWindow.SetIconFromStream(iconStream);
desktopGameWindow.Title = Name; desktopGameWindow.Title = Name;
desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames); desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames);
break; break;
@ -138,6 +140,7 @@ namespace osu.Desktop
// SDL2 DesktopWindow // SDL2 DesktopWindow
case DesktopWindow desktopWindow: case DesktopWindow desktopWindow:
desktopWindow.CursorState.Value |= CursorState.Hidden; desktopWindow.CursorState.Value |= CursorState.Hidden;
desktopWindow.SetIconFromStream(iconStream);
desktopWindow.Title = Name; desktopWindow.Title = Name;
desktopWindow.DragDrop += f => fileDrop(new[] { f }); desktopWindow.DragDrop += f => fileDrop(new[] { f });
break; break;