IPreviewLyricPositionProvider should only provide the ruby tag positi…

…on now.
karaoke-dev · Sep 29, 2023 · dff6246 · dff6246
1 parent 8a7bcee
commit dff6246
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 31 deletions.
diff --git a/...Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestScenePreviewKaraokeSpriteText.cs b/...Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestScenePreviewKaraokeSpriteText.cs
@@ -184,24 +184,7 @@ public void TestGetRubyPosition()
         {
             AddStep($"Show ruby-tag position: {TextTagUtils.PositionFormattedString(rubyTag)}", () =>
             {
-                var position = karaokeSpriteText.GetTextTagByPosition(rubyTag);
-                showPosition(position);
-            });
-        }
-    }
-
-    #endregion
-
-    #region Romaji tag
-
-    [Test]
-    public void TestGetRomajiTagPosition()
-    {
-        foreach (var romajiTag in lyric.RomajiTags)
-        {
-            AddStep($"Show romaji-tag position: {TextTagUtils.PositionFormattedString(romajiTag)}", () =>
-            {
-                var position = karaokeSpriteText.GetTextTagByPosition(romajiTag);
+                var position = karaokeSpriteText.GetRubyTagByPosition(rubyTag);
                 showPosition(position);
             });
         }

diff --git a/...raoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyBlueprintContainer.cs b/...raoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyBlueprintContainer.cs
@@ -131,7 +131,7 @@ void setRubyTagIndex(RubyTag rubyTag, int? startPosition, int? endPosition)
         private int? calculateNewIndex(RubyTag rubyTag, float offset, Anchor anchor)
         {
             // get real left-side and right-side position
-            var rect = previewLyricPositionProvider.GetTextTagByPosition(rubyTag);
+            var rect = previewLyricPositionProvider.GetRubyTagByPosition(rubyTag);
 
             // todo: need to think about how to handle the case if the text-tag already out of the range of the text.
             if (rect == null)

diff --git a/...ke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs b/...ke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs
@@ -95,7 +95,7 @@ protected void UpdatePositionAndSize()
         // wait until lyric update ruby position.
         ScheduleAfterChildren(() =>
         {
-            var rubyTagRect = previewLyricPositionProvider.GetTextTagByPosition(Item);
+            var rubyTagRect = previewLyricPositionProvider.GetRubyTagByPosition(Item);
 
             if (rubyTagRect == null)
             {

diff --git a/...s.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/IPreviewLyricPositionProvider.cs b/...s.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/IPreviewLyricPositionProvider.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Karaoke.Objects;
-using osu.Game.Rulesets.Karaoke.Objects.Types;
 using osuTK;
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Components.Lyrics;
@@ -18,7 +17,7 @@ public interface IPreviewLyricPositionProvider
 
     RectangleF GetRectByCharIndicator(int charIndex);
 
-    RectangleF? GetTextTagByPosition(ITextTag textTag);
+    RectangleF? GetRubyTagByPosition(RubyTag rubyTag);
 
     TimeTag? GetTimeTagByPosition(float position);
 

diff --git a/...lesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs b/...lesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs
@@ -11,7 +11,6 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Objects;
-using osu.Game.Rulesets.Karaoke.Objects.Types;
 using osu.Game.Rulesets.Karaoke.Objects.Utils;
 using osu.Game.Rulesets.Karaoke.Skinning.Elements;
 using osu.Game.Rulesets.Karaoke.Skinning.Tools;
@@ -126,15 +125,10 @@ public RectangleF GetRectByCharIndicator(int charIndex)
 
     #endregion
 
-    #region Ruby/Romaji tag
+    #region Ruby tag
 
-    public RectangleF? GetTextTagByPosition(ITextTag textTag) =>
-        textTag switch
-        {
-            RubyTag rubyTag => spriteText.GetRubyTagPosition(rubyTag),
-            RomajiTag romajiTag => spriteText.GetRomajiTagPosition(romajiTag),
-            _ => throw new ArgumentOutOfRangeException(nameof(textTag)),
-        };
+    public RectangleF? GetRubyTagByPosition(RubyTag rubyTag) =>
+        spriteText.GetRubyTagPosition(rubyTag);
 
     #endregion