From 0a15a13fabd66d5676dfd12e1117772a31ae605a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 Nov 2019 12:55:22 +0900
Subject: [PATCH] Reorder parameters

---
 .../TestSceneStatefulMenuItem.cs              |  4 ++--
 .../UserInterface/StatefulMenuItem.cs         | 20 +++++++++++--------
 .../UserInterface/ThreeStateMenuItem.cs       |  8 +++++++-
 .../Graphics/UserInterface/ToggleMenuItem.cs  |  3 +--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index fbb35ba09f..00678a6ab4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -53,12 +53,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         private class TestMenuItem : StatefulMenuItem<TestStates>
         {
             public TestMenuItem(string text, MenuItemType type = MenuItemType.Standard)
-                : base(text, type)
+                : this(text, type, null)
             {
             }
 
             public TestMenuItem(string text, MenuItemType type, Func<TestStates, TestStates> changeStateFunc)
-                : base(text, type, changeStateFunc)
+                : base(text, changeStateFunc, type)
             {
             }
 
diff --git a/osu.Game/Graphics/UserInterface/StatefulMenuItem.cs b/osu.Game/Graphics/UserInterface/StatefulMenuItem.cs
index ede2c9df48..b5f9a3d635 100644
--- a/osu.Game/Graphics/UserInterface/StatefulMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/StatefulMenuItem.cs
@@ -11,15 +11,19 @@ namespace osu.Game.Graphics.UserInterface
     {
         public readonly Bindable<object> State = new Bindable<object>();
 
-        protected StatefulMenuItem(string text, MenuItemType type = MenuItemType.Standard)
-            : this(text, type, null)
+        protected StatefulMenuItem(string text, Func<object, object> changeStateFunc, MenuItemType type = MenuItemType.Standard)
+            : this(text, changeStateFunc, type, null)
         {
         }
 
-        protected StatefulMenuItem(string text, MenuItemType type, Func<object, object> changeStateFunc)
+        protected StatefulMenuItem(string text, Func<object, object> changeStateFunc, MenuItemType type, Action<object> action)
             : base(text, type)
         {
-            Action.Value = () => State.Value = changeStateFunc?.Invoke(State.Value) ?? State.Value;
+            Action.Value = () =>
+            {
+                State.Value = changeStateFunc?.Invoke(State.Value) ?? State.Value;
+                action?.Invoke(State.Value);
+            };
         }
 
         public abstract IconUsage? GetIconForState(object state);
@@ -30,13 +34,13 @@ namespace osu.Game.Graphics.UserInterface
     {
         public new readonly Bindable<T> State = new Bindable<T>();
 
-        protected StatefulMenuItem(string text, MenuItemType type = MenuItemType.Standard)
-            : this(text, type, null)
+        protected StatefulMenuItem(string text, Func<T, T> changeStateFunc, MenuItemType type = MenuItemType.Standard)
+            : this(text, changeStateFunc, type, null)
         {
         }
 
-        protected StatefulMenuItem(string text, MenuItemType type, Func<T, T> changeStateFunc)
-            : base(text, type, o => changeStateFunc?.Invoke((T)o) ?? o)
+        protected StatefulMenuItem(string text, Func<T, T> changeStateFunc, MenuItemType type, Action<T> action)
+            : base(text, o => changeStateFunc?.Invoke((T)o) ?? o, type, o => action?.Invoke((T)o))
         {
             base.State.BindValueChanged(state =>
             {
diff --git a/osu.Game/Graphics/UserInterface/ThreeStateMenuItem.cs b/osu.Game/Graphics/UserInterface/ThreeStateMenuItem.cs
index 107bfe208b..d41a95daa1 100644
--- a/osu.Game/Graphics/UserInterface/ThreeStateMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/ThreeStateMenuItem.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
@@ -8,7 +9,12 @@ namespace osu.Game.Graphics.UserInterface
     public class ThreeStateMenuItem : StatefulMenuItem<ThreeStates>
     {
         public ThreeStateMenuItem(string text, MenuItemType type = MenuItemType.Standard)
-            : base(text, type, getNextState)
+            : this(text, type, null)
+        {
+        }
+
+        public ThreeStateMenuItem(string text, MenuItemType type, Action<ThreeStates> action)
+            : base(text, getNextState, type, action)
         {
         }
 
diff --git a/osu.Game/Graphics/UserInterface/ToggleMenuItem.cs b/osu.Game/Graphics/UserInterface/ToggleMenuItem.cs
index a0ed745c5a..f5a442b317 100644
--- a/osu.Game/Graphics/UserInterface/ToggleMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/ToggleMenuItem.cs
@@ -14,9 +14,8 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         public ToggleMenuItem(string text, MenuItemType type, Action<bool> action)
-            : base(text, type, value => !value)
+            : base(text, value => !value, type, action)
         {
-            State.BindValueChanged(state => action?.Invoke(state.NewValue));
         }
 
         public override IconUsage? GetIconForState(bool state) => state ? (IconUsage?)FontAwesome.Solid.Check : null;