RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remnants of OsuTK

This commit is contained in:
Dean Herbert 2021-03-12 18:35:42 +09:00
parent 4374e7da81
commit 6eadae8aaf
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Desktop/OsuGameDesktop.cs
View File

@ -136,24 +136,12 @@ public override void SetHost(GameHost host)
var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"); var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
switch (host.Window) var desktopWindow = (SDL2DesktopWindow)host.Window;
{
// Legacy osuTK DesktopGameWindow
case OsuTKDesktopWindow desktopGameWindow:
desktopGameWindow.CursorState |= CursorState.Hidden;
desktopGameWindow.SetIconFromStream(iconStream);
desktopGameWindow.Title = Name;
desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames);
break;
// SDL2 DesktopWindow
case SDL2DesktopWindow desktopWindow:
desktopWindow.CursorState |= CursorState.Hidden; desktopWindow.CursorState |= CursorState.Hidden;
desktopWindow.SetIconFromStream(iconStream); desktopWindow.SetIconFromStream(iconStream);
desktopWindow.Title = Name; desktopWindow.Title = Name;
desktopWindow.DragDrop += f => fileDrop(new[] { f }); desktopWindow.DragDrop += f => fileDrop(new[] { f });
break;
}
} }
private void fileDrop(string[] filePaths) private void fileDrop(string[] filePaths)

2
osu.Desktop/Program.cs
View File

@ -24,7 +24,7 @@ public static int Main(string[] args)
var cwd = Environment.CurrentDirectory; var cwd = Environment.CurrentDirectory;
bool useOsuTK = args.Contains("--tk"); bool useOsuTK = args.Contains("--tk");
using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true, useOsuTK: useOsuTK)) using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
{ {
host.ExceptionThrown += handleException; host.ExceptionThrown += handleException;