Refactor the section.

Use edit way can actually affect the created time-tag type indication.

merge.

osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRemoveTimeTagCaret.cs

@@ -17,6 +17,7 @@
 using osu.Game.Rulesets.Karaoke.Edit.Components.Sprites;
 using osu.Game.Rulesets.Karaoke.Objects;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.CaretPosition;
+using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes;
 using osu.Game.Rulesets.Karaoke.Utils;
 using osuTK;
 
@@ -107,7 +108,10 @@ public TimeTagsInfo(TextIndex.IndexState indexState)
         }
 
         [BackgroundDependencyLoader]
-        private void load(LyricEditorColourProvider colourProvider, ILyricEditorState state, ILyricTimeTagsChangeHandler lyricTimeTagsChangeHandler)
+        private void load(LyricEditorColourProvider colourProvider,
+                          ILyricEditorState state,
+                          ILyricTimeTagsChangeHandler lyricTimeTagsChangeHandler,
+                          IEditTimeTagModeState editTimeTagModeState)
         {
             InternalChildren = new Drawable[]
             {
@@ -171,6 +175,7 @@ private void load(LyricEditorColourProvider colourProvider, ILyricEditorState st
 
                                         var textIndex = new TextIndex(previousCaret.Value.CharIndex, indexState);
                                         lyricTimeTagsChangeHandler.AddByPosition(textIndex);
+                                        editTimeTagModeState.BindableCreateType.Value = CreateTimeTagType.Mouse;
                                     },
                                 },
                             },
@@ -254,6 +259,9 @@ private partial class TimeTagVisualization : CompositeDrawable, IHasTooltip
             [Resolved]
             private ILyricTimeTagsChangeHandler lyricTimeTagsChangeHandler { get; set; } = null!;
 
+            [Resolved]
+            private IEditTimeTagModeState editTimeTagModeState { get; set; } = null!;
+
             private readonly TimeTag timeTag;
 
             public TimeTagVisualization(TimeTag timeTag)
@@ -277,6 +285,7 @@ public TimeTagVisualization(TimeTag timeTag)
             protected override bool OnClick(ClickEvent e)
             {
                 lyricTimeTagsChangeHandler.Remove(timeTag);
+                editTimeTagModeState.BindableCreateType.Value = CreateTimeTagType.Mouse;
 
                 return true;
             }

osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/CreateTimeTagActionSection.cs

@@ -1,7 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
@@ -22,9 +21,7 @@ public partial class CreateTimeTagActionSection : EditorSection, IKeyBindingHand
     [Resolved]
     private ILyricTimeTagsChangeHandler lyricTimeTagsChangeHandler { get; set; } = null!;
 
-    [Resolved]
-    private ILyricCaretState lyricCaretState { get; set; } = null!;
-
+    private readonly IBindable<ICaretPosition?> bindableCaretPosition = new Bindable<ICaretPosition?>();
     private readonly Bindable<CreateTimeTagType> bindableCreateType = new();
 
     public CreateTimeTagActionSection()
@@ -39,43 +36,53 @@ public CreateTimeTagActionSection()
     }
 
     [BackgroundDependencyLoader]
-    private void load(IEditTimeTagModeState editTimeTagModeState)
+    private void load(IEditTimeTagModeState editTimeTagModeState, ILyricCaretState lyricCaretState)
     {
+        bindableCaretPosition.BindTo(lyricCaretState.BindableCaretPosition);
         bindableCreateType.BindTo(editTimeTagModeState.BindableCreateType);
     }
 
     public bool OnPressed(KeyBindingPressEvent<KaraokeEditAction> e)
     {
         var action = e.Action;
-        var caretPosition = lyricCaretState.CaretPosition;
+        var caretPosition = bindableCaretPosition.Value;
+
+        if (caretPosition is not CreateRemoveTimeTagCaretPosition createRemoveTimeTagCaretPosition)
+            return false;
 
-        return caretPosition switch
+        if (LyricEditor.ToMovingCaretAction(e.Action) != null)
         {
-            CreateRemoveTimeTagCaretPosition timeTagIndexCaretPosition => processCreateTimeTagAction(timeTagIndexCaretPosition, action),
-            _ => throw new NotSupportedException(nameof(caretPosition)),
-        };
+            bindableCreateType.Value = CreateTimeTagType.Keyboard;
+            return false;
+        }
+
+        if (createTimeTagByKeyboard(createRemoveTimeTagCaretPosition.CharIndex, action))
+        {
+            bindableCreateType.Value = CreateTimeTagType.Keyboard;
+            return true;
+        }
+
+        return false;
     }
 
-    private bool processCreateTimeTagAction(CreateRemoveTimeTagCaretPosition createRemoveTimeTagCaretPosition, KaraokeEditAction action)
+    private bool createTimeTagByKeyboard(int charIndex, KaraokeEditAction action)
     {
-        int index = createRemoveTimeTagCaretPosition.CharIndex;
-
         switch (action)
         {
             case KaraokeEditAction.CreateStartTimeTag:
-                lyricTimeTagsChangeHandler.AddByPosition(new TextIndex(index));
+                lyricTimeTagsChangeHandler.AddByPosition(new TextIndex(charIndex));
                 return true;
 
             case KaraokeEditAction.CreateEndTimeTag:
-                lyricTimeTagsChangeHandler.AddByPosition(new TextIndex(index, TextIndex.IndexState.End));
+                lyricTimeTagsChangeHandler.AddByPosition(new TextIndex(charIndex, TextIndex.IndexState.End));
                 return true;
 
             case KaraokeEditAction.RemoveStartTimeTag:
-                lyricTimeTagsChangeHandler.RemoveByPosition(new TextIndex(index));
+                lyricTimeTagsChangeHandler.RemoveByPosition(new TextIndex(charIndex));
                 return true;
 
             case KaraokeEditAction.RemoveEndTimeTag:
-                lyricTimeTagsChangeHandler.RemoveByPosition(new TextIndex(index, TextIndex.IndexState.End));
+                lyricTimeTagsChangeHandler.RemoveByPosition(new TextIndex(charIndex, TextIndex.IndexState.End));
                 return true;
 
             default: