Rename the methods.

Should use GetXXXDrawRectangle() instead.
karaoke-dev · May 20, 2022 · 6a7b2ac · 6a7b2ac
1 parent 5c8b5d6
commit 6a7b2ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/osu.Framework.Font.Tests/Visual/Sprites/TestSceneLyricSpriteTextCharacterPosition.cs b/osu.Framework.Font.Tests/Visual/Sprites/TestSceneLyricSpriteTextCharacterPosition.cs
@@ -93,11 +93,11 @@ public TestSceneLyricSpriteTextCharacterPosition()
         [TestCase(6, TextIndex.IndexState.End, true)]
         [TestCase(-1, TextIndex.IndexState.End, false)]
         [TestCase(7, TextIndex.IndexState.Start, false)]
-        public void TestGetTextIndexPosition(int index, TextIndex.IndexState state, bool valid)
+        public void TestGetTextIndexXPosition(int index, TextIndex.IndexState state, bool valid)
         {
             prepareTestCase(() =>
             {
-                var position = lyricSpriteText.GetTextIndexPosition(new TextIndex(index, state));
+                var position = lyricSpriteText.GetTextIndexXPosition(new TextIndex(index, state));
                 return new RectangleF(position, 20, 1, 64);
             }, valid);
         }
@@ -106,9 +106,9 @@ public void TestGetTextIndexPosition(int index, TextIndex.IndexState state, bool
         [TestCase(6, true)]
         [TestCase(-1, false)]
         [TestCase(7, false)]
-        public void TestGetCharacterRectangle(int index, bool valid)
+        public void TestGetCharacterDrawRectangle(int index, bool valid)
         {
-            prepareTestCase(() => lyricSpriteText.GetCharacterRectangle(index), valid);
+            prepareTestCase(() => lyricSpriteText.GetCharacterDrawRectangle(index), valid);
         }
 
         [TestCase("[0,1]:か", true)]
@@ -119,9 +119,9 @@ public void TestGetCharacterRectangle(int index, bool valid)
         [TestCase("[-1,1]:か", false)]
         [TestCase("[0,2]:か", false)]
         [TestCase("[0,1]:?", false)]
-        public void TestGetRubyTagPosition(string rubyTag, bool valid)
+        public void TestGetRubyTagDrawRectangle(string rubyTag, bool valid)
         {
-            prepareTestCase(() => lyricSpriteText.GetRubyTagPosition(TestCaseTagHelper.ParsePositionText(rubyTag)), valid);
+            prepareTestCase(() => lyricSpriteText.GetRubyTagDrawRectangle(TestCaseTagHelper.ParsePositionText(rubyTag)), valid);
         }
 
         [TestCase("[0,1]:ka", true)]
@@ -132,9 +132,9 @@ public void TestGetRubyTagPosition(string rubyTag, bool valid)
         [TestCase("[-1,1]:ka", false)]
         [TestCase("[0,2]:ka", false)]
         [TestCase("[0,1]:?", false)]
-        public void TestGetRomajiTagPosition(string rubyTag, bool valid)
+        public void TestGetRomajiTagDrawRectangle(string rubyTag, bool valid)
         {
-            prepareTestCase(() => lyricSpriteText.GetRomajiTagPosition(TestCaseTagHelper.ParsePositionText(rubyTag)), valid);
+            prepareTestCase(() => lyricSpriteText.GetRomajiTagDrawRectangle(TestCaseTagHelper.ParsePositionText(rubyTag)), valid);
         }
 
         private void prepareTestCase(Func<RectangleF> func, bool valid)

diff --git a/osu.Framework.Font/Graphics/Sprites/KaraokeSpriteText_Transform.cs b/osu.Framework.Font/Graphics/Sprites/KaraokeSpriteText_Transform.cs
@@ -179,8 +179,8 @@ IEnumerable<KeyValuePair<double, TextIndex>> getInterpolatedTimeTagBetweenTwoTim
 
         private float getTextIndexPosition(TextIndex index)
         {
-            var leftTextIndexPosition = leftLyricText.GetTextIndexPosition(index);
-            var rightTextIndexPosition = rightLyricText.GetTextIndexPosition(index);
+            var leftTextIndexPosition = leftLyricText.GetTextIndexXPosition(index);
+            var rightTextIndexPosition = rightLyricText.GetTextIndexXPosition(index);
             return index.State == TextIndex.IndexState.Start
                 ? Math.Min(leftTextIndexPosition, rightTextIndexPosition)
                 : Math.Max(leftTextIndexPosition, rightTextIndexPosition);

diff --git a/osu.Framework.Font/Graphics/Sprites/LyricSpriteText_Characters.cs b/osu.Framework.Font/Graphics/Sprites/LyricSpriteText_Characters.cs
@@ -258,13 +258,13 @@ private void computeScreenSpaceCharacters()
 
         #region Character position
 
-        public float GetTextIndexPosition(TextIndex index)
+        public float GetTextIndexXPosition(TextIndex index)
         {
-            var computedRectangle = GetCharacterRectangle(index.Index);
+            var computedRectangle = GetCharacterDrawRectangle(index.Index);
             return index.State == TextIndex.IndexState.Start ? computedRectangle.Left : computedRectangle.Right;
         }
 
-        public RectangleF GetCharacterRectangle(int index, bool drawSizeOnly = false)
+        public RectangleF GetCharacterDrawRectangle(int index, bool drawSizeOnly = false)
         {
             int charIndex = Math.Clamp(index, 0, Text.Length - 1);
             if (charIndex != index)
@@ -275,7 +275,7 @@ public RectangleF GetCharacterRectangle(int index, bool drawSizeOnly = false)
             return getComputeCharacterDrawRectangle(drawRectangle);
         }
 
-        public RectangleF GetRubyTagPosition(PositionText rubyTag, bool drawSizeOnly = false)
+        public RectangleF GetRubyTagDrawRectangle(PositionText rubyTag, bool drawSizeOnly = false)
         {
             int rubyIndex = Rubies.ToList().IndexOf(rubyTag);
             if (rubyIndex < 0)
@@ -290,7 +290,7 @@ public RectangleF GetRubyTagPosition(PositionText rubyTag, bool drawSizeOnly = f
             return getComputeCharacterDrawRectangle(drawRectangle);
         }
 
-        public RectangleF GetRomajiTagPosition(PositionText romajiTag, bool drawSizeOnly = false)
+        public RectangleF GetRomajiTagDrawRectangle(PositionText romajiTag, bool drawSizeOnly = false)
         {
             int romajiIndex = Romajies.ToList().IndexOf(romajiTag);
             if (romajiIndex < 0)