diff --git a/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs index 6eae505bc..038da1191 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs @@ -111,9 +111,9 @@ protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpaceP return null; } - public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) + public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition) { - var result = base.SnapScreenSpacePositionToValidTime(screenSpacePosition); + var result = base.FindSnappedPositionAndTime(screenSpacePosition); // should not affect x position and time if dragging object in note playfield. return result.Playfield is EditorNotePlayfield diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Extends/Components/Description/DescriptionTextFlowContainer.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Extends/Components/Description/DescriptionTextFlowContainer.cs index 59ec14484..f887632eb 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Extends/Components/Description/DescriptionTextFlowContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Extends/Components/Description/DescriptionTextFlowContainer.cs @@ -6,7 +6,6 @@ using Markdig; using Markdig.Syntax; using Markdig.Syntax.Inlines; -using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers.Markdown; @@ -17,7 +16,6 @@ namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Extends.Components.Description { - [Cached(typeof(IMarkdownTextComponent))] public class DescriptionTextFlowContainer : Container, IMarkdownTextComponent { private readonly DescriptionMarkdownTextFlowContainer description; diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs index 5486b8ae8..3ef76f17d 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs @@ -98,10 +98,10 @@ protected override void OnUserScroll(float value, bool animated = true, double? base.OnUserScroll(value, animated, distanceDecay); } - public SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition) => + public SnapResult FindSnappedPosition(Vector2 screenSpacePosition) => new(screenSpacePosition, null); - public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => + public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition) => new(screenSpacePosition, getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition))); private double getTimeFromPosition(Vector2 localPosition) => diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditorBlueprintContainer.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditorBlueprintContainer.cs index 507cd663c..62ecf7517 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditorBlueprintContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditorBlueprintContainer.cs @@ -121,7 +121,7 @@ protected override bool OnClick(ClickEvent e) return true; // navigation to target time. - var navigationTime = timeline.SnapScreenSpacePositionToValidTime(e.ScreenSpaceMousePosition); + var navigationTime = timeline.FindSnappedPositionAndTime(e.ScreenSpaceMousePosition); if (navigationTime.Time == null) return false; diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/SaitenStatus.cs b/osu.Game.Rulesets.Karaoke/UI/Components/SaitenStatus.cs index 3df0a2684..4baf7f372 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Components/SaitenStatus.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Components/SaitenStatus.cs @@ -5,7 +5,6 @@ using System.Linq; using Markdig; using Markdig.Syntax; -using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers.Markdown; @@ -17,7 +16,6 @@ namespace osu.Game.Rulesets.Karaoke.UI.Components { - [Cached(typeof(IMarkdownTextComponent))] public class SaitenStatus : FillFlowContainer, IMarkdownTextComponent { private const float size = 22; diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index ac0b614f6..3244d4ab5 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -12,7 +12,7 @@ - +