h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 18:23:04 +08:00
Code Issues Releases Wiki Activity

Change beatmap import to use OpenTK's FileDrop event

Browse Source
This commit is contained in:
Shane Woolcock 2017-10-22 00:55:32 +10:30
parent a6f48f7f9f
commit a9657d2142
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Desktop/OsuGameDesktop.cs
View File

@ -7,13 +7,13 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms;
using Microsoft.Win32; using Microsoft.Win32;
using osu.Desktop.Overlays; using osu.Desktop.Overlays;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game; using osu.Game;
using osu.Game.Screens.Menu; using osu.Game.Screens.Menu;
using OpenTK.Input;
namespace osu.Desktop namespace osu.Desktop
{ {
@ -105,16 +105,13 @@ namespace osu.Desktop
desktopWindow.Icon = new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico")); desktopWindow.Icon = new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
desktopWindow.Title = Name; desktopWindow.Title = Name;
desktopWindow.DragEnter += dragEnter; desktopWindow.FileDrop += fileDrop;
desktopWindow.DragDrop += dragDrop;
} }
} }
private void dragDrop(DragEventArgs e) private void fileDrop(object sender, FileDropEventArgs e)
{ {
// this method will only be executed if e.Effect in dragEnter gets set to something other that None. var filePaths = new [] { e.FileName };
var dropData = (object[])e.Data.GetData(DataFormats.FileDrop);
var filePaths = dropData.Select(f => f.ToString()).ToArray();
if (filePaths.All(f => Path.GetExtension(f) == @".osz")) if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
Task.Run(() => BeatmapManager.Import(filePaths)); Task.Run(() => BeatmapManager.Import(filePaths));
@ -127,16 +124,5 @@ namespace osu.Desktop
} }
private static readonly string[] allowed_extensions = { @".osz", @".osr" }; private static readonly string[] allowed_extensions = { @".osz", @".osr" };
private void dragEnter(DragEventArgs e)
{
// dragDrop will only be executed if e.Effect gets set to something other that None in this method.
bool isFile = e.Data.GetDataPresent(DataFormats.FileDrop);
if (isFile)
{
var paths = ((object[])e.Data.GetData(DataFormats.FileDrop)).Select(f => f.ToString()).ToArray();
e.Effect = allowed_extensions.Any(ext => paths.All(p => p.EndsWith(ext))) ? DragDropEffects.Copy : DragDropEffects.None;
}
}
} }
} }