h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Renamed method and moved Notifications inside

Browse Source
This commit is contained in:
ratinfx 2023-11-07 00:56:24 +01:00
parent 8e8a88cfaf
commit 0834b79cc7
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/OsuGame.cs
View File

@ -562,18 +562,15 @@ namespace osu.Game
{
if (ScreenStack.CurrentScreen is not Editor editor)
{
postNotification(EditorStrings.MustBeInEdit);
Schedule(() => Notifications.Post(new SimpleNotification
{
Icon = FontAwesome.Solid.ExclamationTriangle,
Text = EditorStrings.MustBeInEdit
}));
return;
}
editor.SeekAndSelectHitObjects(timestamp, onError: postNotification);
return;
void postNotification(LocalisableString message) => Schedule(() => Notifications.Post(new SimpleNotification
{
Icon = FontAwesome.Solid.ExclamationTriangle,
Text = message
}));
editor.HandleTimestamp(timestamp);
}
/// <summary>

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

@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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.
#nullable disable
@ -1138,13 +1138,17 @@ namespace osu.Game.Screens.Edit
loader?.CancelPendingDifficultySwitch();
}
public void SeekAndSelectHitObjects(string timestamp, Action<LocalisableString> onError)
public void HandleTimestamp(string timestamp)
{
string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
{
onError.Invoke(EditorStrings.FailedToProcessTimestamp);
Schedule(() => notifications.Post(new SimpleNotification
{
Icon = FontAwesome.Solid.ExclamationTriangle,
Text = EditorStrings.FailedToProcessTimestamp
}));
return;
}
@ -1156,7 +1160,11 @@ namespace osu.Game.Screens.Edit
// Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
{
onError.Invoke(EditorStrings.TooLongTimestamp);
Schedule(() => notifications.Post(new SimpleNotification
{
Icon = FontAwesome.Solid.ExclamationTriangle,
Text = EditorStrings.TooLongTimestamp
}));
return;
}