Clean-up code.

karaoke-dev · Dec 13, 2020 · 5ecc442 · 5ecc442
1 parent 806390d
commit 5ecc442
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/DrawableLyricEditListItem.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/DrawableLyricEditListItem.cs
@@ -23,7 +23,6 @@ public class DrawableLyricEditListItem : OsuRearrangeableListItem<Lyric>
 
         private Box background;
         private Box dragAlert;
-
 
         public DrawableLyricEditListItem(Lyric item)
             : base(item)

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Infos/InfoControl.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Infos/InfoControl.cs
@@ -17,7 +17,7 @@ public class InfoControl : Container
     {
         private const int max_height = 120;
 
-        private Box headerBackground;
+        private readonly Box headerBackground;
 
         public Lyric Lyric { get; }
 

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorScreen.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorScreen.cs
@@ -34,6 +34,7 @@ public class LyricEditorScreen : EditorScreenWithTimeline, ICanAcceptFiles
 
         [Cached]
         protected readonly TimeTagManager TranslateManager;
+
         [Cached]
         protected readonly LyricManager LyricManager;
 

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Lyrics/DrawableEditorLyric.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Lyrics/DrawableEditorLyric.cs
@@ -63,6 +63,7 @@ public int GetHoverIndex(float position)
                 if (GetPercentageWidth(i, i + 1, 0.5f) > position)
                     return i;
             }
+
             return text.Length;
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Lyrics/LyricControl.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Lyrics/LyricControl.cs
@@ -106,7 +106,7 @@ private void load(IFrameBasedClock framedClock, TimeTagManager timeTagManager)
             drawableLyric.Clock = framedClock;
             timeTagManager?.BindableCursorPosition.BindValueChanged(e =>
             {
-                UpdateTimeTagCursoe(e.NewValue);
+                UpdateTimeTagCursor(e.NewValue);
             }, true);
             lyricManager?.BindableSplitLyric.BindValueChanged(e =>
             {
@@ -118,19 +118,20 @@ private void load(IFrameBasedClock framedClock, TimeTagManager timeTagManager)
             });
         }
 
-        protected void UpdateTimeTagCursoe(TimeTag cursor)
+        protected void UpdateTimeTagCursor(TimeTag cursor)
         {
             timeTagCursorContainer.Clear();
-            if (drawableLyric.TimeTagsBindable.Value.Contains(cursor))
+
+            if (!drawableLyric.TimeTagsBindable.Value.Contains(cursor))
+                return;
+
+            var spacing = timeTagIndexPosition(cursor.Index) + extraSpacing(cursor);
+            timeTagCursorContainer.Add(new DrawableTimeTagCursor(cursor)
             {
-                var spacing = timeTagIndexPosition(cursor.Index) + extraSpacing(cursor);
-                timeTagCursorContainer.Add(new DrawableTimeTagCursor(cursor)
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    X = spacing
-                });
-            }
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                X = spacing
+            });
         }
 
         protected void UpdateTimeTags()
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,7 @@ public int GetHoverIndex(float position) @@
                     if (GetPercentageWidth(i, i + 1, 0.5f) > position)
                         return i;
                 }
                 return text.Length;
             }
         }
@@ Expand Down @@