sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-04 13:17:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Copy editor timestamp to OS clipboard even when triggered via menu bar

Browse Source 
Would only work when triggered via Ctrl+C before, and not work at all
for Ctrl+X.
This commit is contained in:
Bartłomiej Dach 2021-11-10 12:49:04 +01:00
parent 5e31e890ae
commit b25ad8dfcb
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
1 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
osu.Game/Screens/Edit/Compose/ComposeScreen.cs
View File

@ -7,9 +7,6 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Extensions; using osu.Game.Extensions;
@ -20,7 +17,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
namespace osu.Game.Screens.Edit.Compose namespace osu.Game.Screens.Edit.Compose
{ {
public class ComposeScreen : EditorScreenWithTimeline, IKeyBindingHandler<PlatformAction> public class ComposeScreen : EditorScreenWithTimeline
{ {
[Resolved] [Resolved]
private GameHost host { get; set; } private GameHost host { get; set; }
@ -89,35 +86,6 @@ namespace osu.Game.Screens.Edit.Compose
clipboard.BindValueChanged(_ => updateClipboardActionAvailability(), true); clipboard.BindValueChanged(_ => updateClipboardActionAvailability(), true);
} }
#region Input Handling
public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
{
if (e.Action == PlatformAction.Copy)
host.GetClipboard()?.SetText(formatSelectionAsString());
return false;
}
public void OnReleased(KeyBindingReleaseEvent<PlatformAction> e)
{
}
private string formatSelectionAsString()
{
if (composer == null)
return string.Empty;
double displayTime = EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime ?? clock.CurrentTime;
string selectionAsString = composer.ConvertSelectionToString();
return !string.IsNullOrEmpty(selectionAsString)
? $"{displayTime.ToEditorFormattedString()} ({selectionAsString}) - "
: $"{displayTime.ToEditorFormattedString()} - ";
}
#endregion
#region Clipboard operations #region Clipboard operations
protected override void PerformCut() protected override void PerformCut()
@ -133,6 +101,8 @@ namespace osu.Game.Screens.Edit.Compose
base.PerformCopy(); base.PerformCopy();
clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize(); clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize();
host.GetClipboard()?.SetText(formatSelectionAsString());
} }
protected override void PerformPaste() protected override void PerformPaste()
@ -164,6 +134,19 @@ namespace osu.Game.Screens.Edit.Compose
CanPaste.Value = !string.IsNullOrEmpty(clipboard.Value); CanPaste.Value = !string.IsNullOrEmpty(clipboard.Value);
} }
private string formatSelectionAsString()
{
if (composer == null)
return string.Empty;
double displayTime = EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime ?? clock.CurrentTime;
string selectionAsString = composer.ConvertSelectionToString();
return !string.IsNullOrEmpty(selectionAsString)
? $"{displayTime.ToEditorFormattedString()} ({selectionAsString}) - "
: $"{displayTime.ToEditorFormattedString()} - ";
}
#endregion #endregion
} }
} }