From 6f4e97be66709a31591a0a82d8ebbd0dd917e512 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Mon, 25 Sep 2023 22:27:10 +0800 Subject: [PATCH] Adjust the DI order also. --- .../Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs | 4 ++-- .../Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs | 8 ++++---- .../Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs index de338f883..8a09a60e9 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs @@ -27,10 +27,10 @@ public partial class IssueNavigator : Component, IIssueNavigator private IEditRubyModeState editRubyModeState { get; set; } = null!; [Resolved] - private IEditRomajiModeState editRomajiModeState { get; set; } = null!; + private ITimeTagModeState timeTagModeState { get; set; } = null!; [Resolved] - private ITimeTagModeState timeTagModeState { get; set; } = null!; + private IEditRomajiModeState editRomajiModeState { get; set; } = null!; [Resolved] private IEditNoteModeState noteModeState { get; set; } = null!; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs index 3b1e80476..7b59670e3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs @@ -53,12 +53,12 @@ public partial class LyricEditor : Container, ILyricEditorState, IKeyBindingHand [Cached(typeof(IEditRubyModeState))] private readonly EditRubyModeState editRubyModeState; - [Cached(typeof(IEditRomajiModeState))] - private readonly EditRomajiModeState editRomajiModeState; - [Cached(typeof(ITimeTagModeState))] private readonly TimeTagModeState timeTagModeState; + [Cached(typeof(IEditRomajiModeState))] + private readonly EditRomajiModeState editRomajiModeState; + [Cached(typeof(IEditNoteModeState))] private readonly EditNoteModeState editNoteModeState; @@ -103,8 +103,8 @@ public LyricEditor() AddInternal(editReferenceLyricModeState = new EditReferenceLyricModeState()); AddInternal(languageModeState = new LanguageModeState()); AddInternal(editRubyModeState = new EditRubyModeState()); - AddInternal(editRomajiModeState = new EditRomajiModeState()); AddInternal(timeTagModeState = new TimeTagModeState()); + AddInternal(editRomajiModeState = new EditRomajiModeState()); AddInternal(editNoteModeState = new EditNoteModeState()); // Separated feature. diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs index 9c9ae4116..63a309d7b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs @@ -42,10 +42,10 @@ public partial class LyricEditorClipboard : Component, ILyricEditorClipboard private IEditRubyModeState editRubyModeState { get; set; } = null!; [Resolved] - private IEditRomajiModeState editRomajiModeState { get; set; } = null!; + private ITimeTagModeState timeTagModeState { get; set; } = null!; [Resolved] - private ITimeTagModeState timeTagModeState { get; set; } = null!; + private IEditRomajiModeState editRomajiModeState { get; set; } = null!; [Resolved] private ILyricsChangeHandler? lyricsChangeHandler { get; set; }