From ec366b7a916157f672f7cfba7c05e9d86e1ef662 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Tue, 25 Jun 2024 21:50:22 +0800 Subject: [PATCH] Upgrade package to the latest and fix the compile error. --- .../Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs | 4 ++-- .../Graphics/UserInterfaceV2/LanguageSelector.cs | 2 +- .../Components/UserInterfaceV2/LanguageSelectorPopover.cs | 2 +- .../Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs | 2 +- .../Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs | 2 +- .../Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs | 4 ++-- .../Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs | 2 +- .../Lyrics/Compose/BottomEditor/Notes/NoteEditPopover.cs | 2 +- .../Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs | 2 +- .../Settings/Reference/LabelledReferenceLyricSelector.cs | 2 +- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs index 8816d9fd7..ec816d46e 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs @@ -1,15 +1,15 @@ // Copyright (c) andy840119 . Licensed under the GPL Licence. // See the LICENCE file in the repository root for full licence text. -using System; using osu.Framework.Graphics; using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Overlays.Settings; +using System.Numerics; namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterfaceV2; public partial class LabelledRealTimeSliderBar : LabelledSliderBar - where TNumber : struct, IEquatable, IComparable, IConvertible + where TNumber : struct, INumber, IMinMaxValue { protected override SettingsSlider CreateComponent() => base.CreateComponent().With(x => x.TransferValueOnCommit = false); diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs index 52b378d43..b093fe877 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs @@ -85,7 +85,7 @@ protected override void OnFocus(FocusEvent e) { base.OnFocus(e); - GetContainingInputManager().ChangeFocus(filter); + GetContainingFocusManager().ChangeFocus(filter); } private bool enableEmptyOption; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs index 0688d849b..11b414988 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs @@ -32,6 +32,6 @@ protected override void LoadComplete() { base.LoadComplete(); - GetContainingInputManager().ChangeFocus(languageSelector); + GetContainingFocusManager().ChangeFocus(languageSelector); } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs index 9847efde4..a966c85ee 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs @@ -87,7 +87,7 @@ protected override void OnFocus(FocusEvent e) { base.OnFocus(e); - GetContainingInputManager().ChangeFocus(filter); + GetContainingFocusManager().ChangeFocus(filter); } private partial class LyricSelectionSearchTextBox : SearchTextBox diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs index de3c78cc2..afb9ca999 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyTagSelectionBlueprint.cs @@ -214,7 +214,7 @@ void deleteRubyText() protected override void LoadComplete() { base.LoadComplete(); - ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(labelledRubyTextBox)); + ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(labelledRubyTextBox)); } private partial class DeleteRubyButton : EditorSectionButton diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs index 6f8f12d77..4f04300ef 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs @@ -191,7 +191,7 @@ private void addRubyText() if (string.IsNullOrEmpty(rubyText)) { labelledRubyTextBox.Description = "Please enter the ruby text"; - GetContainingInputManager().ChangeFocus(labelledRubyTextBox); + GetContainingFocusManager().ChangeFocus(labelledRubyTextBox); return; } @@ -208,7 +208,7 @@ private void addRubyText() protected override void LoadComplete() { base.LoadComplete(); - ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(labelledRubyTextBox)); + ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(labelledRubyTextBox)); } private partial class CreateRubyLabelledTextBox : LabelledTextBox diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs index 2c13ab474..ff45e94de 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs @@ -178,7 +178,7 @@ public void FocusInputCaretTextBox() Schedule(() => { inputCaretTextBox.Text = string.Empty; - GetContainingInputManager().ChangeFocus(inputCaretTextBox); + GetContainingFocusManager().ChangeFocus(inputCaretTextBox); }); } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditPopover.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditPopover.cs index f19f11076..8dc28b8f9 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditPopover.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditPopover.cs @@ -75,7 +75,7 @@ public NoteSection(Note note) ScheduleAfterChildren(() => { - GetContainingInputManager().ChangeFocus(text); + GetContainingFocusManager().ChangeFocus(text); }); text.OnCommit += (sender, newText) => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs index 57b4b988c..7f516ed47 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs @@ -99,7 +99,7 @@ private void focus() if (IsFocused(focusedDrawable)) return; - GetContainingInputManager().ChangeFocus(Component); + GetContainingFocusManager().ChangeFocus(Component); }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs index 2b72ed761..a64d4b1a9 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs @@ -105,7 +105,7 @@ protected override void LoadComplete() { base.LoadComplete(); - GetContainingInputManager().ChangeFocus(lyricSelector); + GetContainingFocusManager().ChangeFocus(lyricSelector); } } diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index ae05555ae..502e6083b 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - +