RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-09 22:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add region for import methods and move Dispose to end of time

Browse Source
This commit is contained in:
Dean Herbert 2022-04-04 20:30:14 +09:00
parent dac5dfde8f
commit de30a42558
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Skinning/Editor/SkinEditor.cs
View File

@ -197,13 +197,6 @@ namespace osu.Game.Skinning.Editor
SelectedComponents.BindCollectionChanged((_, __) => Scheduler.AddOnce(populateSettings), true); SelectedComponents.BindCollectionChanged((_, __) => Scheduler.AddOnce(populateSettings), true);
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
game?.UnregisterImportHandler(this);
}
public void UpdateTargetScreen(Drawable targetScreen) public void UpdateTargetScreen(Drawable targetScreen)
{ {
this.targetScreen = targetScreen; this.targetScreen = targetScreen;
@ -337,6 +330,8 @@ namespace osu.Game.Skinning.Editor
availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item); availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
} }
#region Drag & drop import handling
public Task Import(params string[] paths) public Task Import(params string[] paths)
{ {
Schedule(() => Schedule(() =>
@ -368,5 +363,14 @@ namespace osu.Game.Skinning.Editor
public Task Import(params ImportTask[] tasks) => throw new NotImplementedException(); public Task Import(params ImportTask[] tasks) => throw new NotImplementedException();
public IEnumerable<string> HandledExtensions => new[] { ".jpg", ".jpeg", ".png" }; public IEnumerable<string> HandledExtensions => new[] { ".jpg", ".jpeg", ".png" };
#endregion
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
game?.UnregisterImportHandler(this);
}
} }
} }