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

Add sub screen to limit user interactions

Browse Source
This commit is contained in:
Dean Herbert 2024-07-09 20:57:29 +09:00
parent d3c66e2404
commit 118162c631
No known key found for this signature in database
2 changed files with 84 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
osu.Game/Screens/Edit/Editor.cs
View File

@ -5,7 +5,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using JetBrains.Annotations;
@ -14,7 +13,6 @@ using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@ -24,7 +22,6 @@ using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Framework.Testing;
using osu.Framework.Threading;
@ -823,9 +820,6 @@ namespace osu.Game.Screens.Edit
resetTrack();
fileMountOperation?.Dispose();
fileMountOperation = null;
refetchBeatmap();
return base.OnExiting(e);
@ -1101,11 +1095,6 @@ namespace osu.Game.Screens.Edit
lastSavedHash = changeHandler?.CurrentStateHash;
}
private EditorMenuItem mountFilesItem;
[CanBeNull]
private Task<ExternalEditOperation<BeatmapSetInfo>> fileMountOperation;
private IEnumerable<MenuItem> createFileMenuItems()
{
yield return createDifficultyCreationMenu();
@ -1124,43 +1113,15 @@ namespace osu.Game.Screens.Edit
saveRelatedMenuItems.AddRange(export.Items);
yield return export;
yield return mountFilesItem = new EditorMenuItem("Mount files", MenuItemType.Standard, mountFiles);
var externalEdit = new EditorMenuItem("Edit externally", MenuItemType.Standard, editExternally);
saveRelatedMenuItems.Add(externalEdit);
yield return externalEdit;
}
yield return new OsuMenuItemSpacer();
yield return new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, this.Exit);
}
[Resolved]
private GameHost gameHost { get; set; }
private void mountFiles()
{
if (fileMountOperation == null)
{
Save();
fileMountOperation = beatmapManager.BeginExternalEditing(editorBeatmap.BeatmapInfo.BeatmapSet!);
mountFilesItem.Text.Value = "Dismount files";
fileMountOperation.ContinueWith(t =>
{
var operation = t.GetResultSafely();
// Ensure the trailing separator is present in order to show the folder contents.
gameHost.OpenFileExternally(operation.MountedPath.TrimDirectorySeparator() + Path.DirectorySeparatorChar);
});
}
else
{
fileMountOperation.GetResultSafely().Finish().ContinueWith(t => Schedule(() =>
{
fileMountOperation = null;
SwitchToDifficulty(t.GetResultSafely().Value.Detach().Beatmaps.First());
}));
}
}
private EditorMenuItem createExportMenu()
{
var exportItems = new List<MenuItem>
@ -1172,6 +1133,14 @@ namespace osu.Game.Screens.Edit
return new EditorMenuItem(CommonStrings.Export) { Items = exportItems };
}
private void editExternally()
{
Save();
var editOperation = beatmapManager.BeginExternalEditing(editorBeatmap.BeatmapInfo.BeatmapSet!);
this.Push(new ExternalEditScreen(editOperation, this));
}
private void exportBeatmap(bool legacy)
{
if (HasUnsavedChanges)
@ -1303,7 +1272,11 @@ namespace osu.Game.Screens.Edit
return new EditorMenuItem(EditorStrings.ChangeDifficulty) { Items = difficultyItems };
}
protected void SwitchToDifficulty(BeatmapInfo nextBeatmap) => loader?.ScheduleSwitchToExistingDifficulty(nextBeatmap, GetState(nextBeatmap.Ruleset));
public void SwitchToDifficulty(BeatmapInfo nextBeatmap)
{
switchingDifficulty = true;
loader?.ScheduleSwitchToExistingDifficulty(nextBeatmap, GetState(nextBeatmap.Ruleset));
}
private void cancelExit()
{

68
osu.Game/Screens/Edit/ExternalEditScreen.cs Normal file
View File

@ -0,0 +1,68 @@
#nullable enable
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Platform;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Overlays.Settings;
namespace osu.Game.Screens.Edit
{
internal partial class ExternalEditScreen : OsuScreen
{
private readonly Task<ExternalEditOperation<BeatmapSetInfo>> fileMountOperation;
[Resolved]
private GameHost gameHost { get; set; } = null!;
private readonly Editor? editor;
public ExternalEditScreen(Task<ExternalEditOperation<BeatmapSetInfo>> fileMountOperation, Editor editor)
{
this.fileMountOperation = fileMountOperation;
this.editor = editor;
}
protected override void LoadComplete()
{
base.LoadComplete();
fileMountOperation.ContinueWith(t =>
{
var operation = t.GetResultSafely<ExternalEditOperation<BeatmapSetInfo>>();
// Ensure the trailing separator is present in order to show the folder contents.
gameHost.OpenFileExternally(operation.MountedPath.TrimDirectorySeparator() + Path.DirectorySeparatorChar);
});
InternalChildren = new Drawable[]
{
new SettingsButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Text = "end editing",
Action = finish,
}
};
}
private void finish()
{
fileMountOperation.GetResultSafely().Finish().ContinueWith(t =>
{
Schedule(() =>
{
editor?.SwitchToDifficulty(t.GetResultSafely<Live<BeatmapSetInfo>>().Value.Detach().Beatmaps.First());
});
});
}
}
}