h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 01:47:33 +08:00
Code Issues Releases Wiki Activity

Restore clipboard content after difficulty switch

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-09-11 17:55:11 +02:00
parent 79d0f4835e
commit 35ee889e5b
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,13 +744,16 @@ namespace osu.Game.Screens.Edit
protected void SwitchToDifficulty(BeatmapInfo nextBeatmap) => loader?.ScheduleDifficultySwitch(nextBeatmap, new EditorState protected void SwitchToDifficulty(BeatmapInfo nextBeatmap) => loader?.ScheduleDifficultySwitch(nextBeatmap, new EditorState
{ {
Time = clock.CurrentTimeAccurate Time = clock.CurrentTimeAccurate,
ClipboardContent = editorBeatmap.BeatmapInfo.RulesetID == nextBeatmap.RulesetID ? clipboard.Value : null
}); });
private void restoreState([NotNull] EditorState state) private void restoreState([NotNull] EditorState state)
{ {
if (state.Time != null) if (state.Time != null)
clock.Seek(state.Time.Value); clock.Seek(state.Time.Value);
clipboard.Value = state.ClipboardContent ?? clipboard.Value;
} }
private void cancelExit() => loader?.CancelPendingDifficultySwitch(); private void cancelExit() => loader?.CancelPendingDifficultySwitch();

5
osu.Game/Screens/Edit/EditorState.cs
View File

@ -15,5 +15,10 @@ namespace osu.Game.Screens.Edit
/// The current clock time when a difficulty switch was requested. /// The current clock time when a difficulty switch was requested.
/// </summary> /// </summary>
public double? Time { get; set; } public double? Time { get; set; }
/// <summary>
/// The current editor clipboard content at the time when a difficulty switch was requested.
/// </summary>
public string? ClipboardContent { get; set; }
} }
} }