Should be gap index.

karaoke-dev · Aug 16, 2024 · 1980d31 · 1980d31
1 parent 1aa4435
commit 1980d31
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/...e/Screens/Edit/Beatmaps/Lyrics/Content/Components/Lyrics/IPreviewLyricPositionProvider.cs b/...e/Screens/Edit/Beatmaps/Lyrics/Content/Components/Lyrics/IPreviewLyricPositionProvider.cs
@@ -15,7 +15,7 @@ public interface IPreviewLyricPositionProvider
 
     int GetCharIndicatorByPosition(float position);
 
-    RectangleF GetRectByCharIndicator(int charIndex);
+    RectangleF GetRectByCharIndicator(int gapIndex);
 
     RectangleF? GetRubyTagByPosition(RubyTag rubyTag);
 

diff --git a/...ame.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Content/Components/Lyrics/LyricLayer.cs b/...ame.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Content/Components/Lyrics/LyricLayer.cs
@@ -69,8 +69,8 @@ public RectangleF GetRectByCharIndex(int charIndex)
     public int GetCharIndicatorByPosition(float position)
         => previewKaraokeSpriteText.GetCharIndicatorByPosition(position - LyricPosition.X);
 
-    public RectangleF GetRectByCharIndicator(int charIndex)
-        => previewKaraokeSpriteText.GetRectByCharIndicator(charIndex).Offset(LyricPosition);
+    public RectangleF GetRectByCharIndicator(int gapIndex)
+        => previewKaraokeSpriteText.GetRectByCharIndicator(gapIndex).Offset(LyricPosition);
 
     #endregion
 

diff --git a/...araoke/Screens/Edit/Beatmaps/Lyrics/Content/Components/Lyrics/PreviewKaraokeSpriteText.cs b/...araoke/Screens/Edit/Beatmaps/Lyrics/Content/Components/Lyrics/PreviewKaraokeSpriteText.cs
@@ -113,27 +113,27 @@ float getTriggerPositionByTimeIndex(int charIndex)
         }
     }
 
-    public RectangleF GetRectByCharIndicator(int charIndex)
+    public RectangleF GetRectByCharIndicator(int gapIndex)
     {
-        if (charIndex < 0 || charIndex > Text.Length)
-            throw new ArgumentOutOfRangeException(nameof(charIndex));
+        if (gapIndex < 0 || gapIndex > Text.Length)
+            throw new ArgumentOutOfRangeException(nameof(gapIndex));
 
         const float min_spacing_width = 1;
 
-        if (charIndex == 0)
+        if (gapIndex == 0)
         {
-            var referenceRectangle = spriteText.GetCharacterDrawRectangle(charIndex);
+            var referenceRectangle = spriteText.GetCharacterDrawRectangle(gapIndex);
             return new RectangleF(referenceRectangle.X - min_spacing_width, referenceRectangle.Y, min_spacing_width, referenceRectangle.Height);
         }
 
-        if (charIndex == Text.Length)
+        if (gapIndex == Text.Length)
         {
-            var referenceRectangle = spriteText.GetCharacterDrawRectangle(charIndex - 1);
+            var referenceRectangle = spriteText.GetCharacterDrawRectangle(gapIndex - 1);
             return new RectangleF(referenceRectangle.Right, referenceRectangle.Top, min_spacing_width, referenceRectangle.Height);
         }
 
-        var leftRectangle = spriteText.GetCharacterDrawRectangle(charIndex - 1);
-        var rightRectangle = spriteText.GetCharacterDrawRectangle(charIndex);
+        var leftRectangle = spriteText.GetCharacterDrawRectangle(gapIndex - 1);
+        var rightRectangle = spriteText.GetCharacterDrawRectangle(gapIndex);
         return new RectangleF(leftRectangle.Right, leftRectangle.Top, rightRectangle.X - leftRectangle.Right, leftRectangle.Y);
     }