Merge pull request #1154 from andy840119/update-nuget-package

Update nuget package
karaoke-dev · Mar 6, 2022 · 3bbafac · 3bbafac
2 parents 8c5fc89 + 5b6dcfe
commit 3bbafac
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 55 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Menus/GenericEditorMenuBar.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Menus/GenericEditorMenuBar.cs
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Menus/GenericScreenSelectionTabControl.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Menus/GenericScreenSelectionTabControl.cs
@@ -8,11 +8,16 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Edit.Components.Menus;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Components.Menus
 {
+    /// <summary>
+    /// Copied from <see cref="ScreenSelectionTabControl"/>
+    /// </summary>
+    /// <typeparam name="TScreenMode"></typeparam>
     public class GenericScreenSelectionTabControl<TScreenMode> : OsuTabControl<TScreenMode>
     {
         public GenericScreenSelectionTabControl()

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs
@@ -38,11 +38,13 @@ public abstract class GenericEditor<TScreenMode> : ScreenWithBeatmapBackground,
 
         public override bool? AllowTrackAdjustments => false;
 
+        public readonly Bindable<TScreenMode> Mode = new();
+
         private Container<GenericEditorScreen<TScreenMode>> screenContainer;
 
         private GenericEditorScreen<TScreenMode> currentScreen;
 
-        private GenericEditorMenuBar<TScreenMode> menuBar;
+        private EditorMenuBar menuBar;
 
         private DependencyContainer dependencies;
 
@@ -82,12 +84,22 @@ private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDi
                         Name = "Top bar",
                         RelativeSizeAxes = Axes.X,
                         Height = 40,
-                        Child = menuBar = new GenericEditorMenuBar<TScreenMode>
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            RelativeSizeAxes = Axes.Both,
-                        }
+                            menuBar = new EditorMenuBar
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            new GenericScreenSelectionTabControl<TScreenMode>
+                            {
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight,
+                                X = -15,
+                                Current = Mode,
+                            },
+                        },
                     },
                     new Container
                     {
@@ -145,7 +157,7 @@ private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDi
                 }
             });
 
-            menuBar.Mode.ValueChanged += onModeChanged;
+            Mode.BindValueChanged(onModeChanged, true);
         }
 
         private void onModeChanged(ValueChangedEvent<TScreenMode> e)

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.214.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.214.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.226.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.306.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />