From 9e2be6f2f438dcc288bbe711c486a8cc112e310d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Apr 2020 13:25:08 +0900
Subject: [PATCH] Remove bindable to promote one-way access

---
 osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs | 6 +++---
 osu.Game/Graphics/UserInterface/OsuMenuItem.cs          | 6 ------
 osu.Game/Screens/Edit/Editor.cs                         | 9 +++++++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
index c171e567ad..9ea76c2c7b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("disable menu items", () =>
             {
                 foreach (var item in menu.Items)
-                    ((OsuMenuItem)item).Enabled.Value = false;
+                    ((OsuMenuItem)item).Action.Disabled = true;
             });
 
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
@@ -71,13 +71,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("disable menu items", () =>
             {
                 foreach (var item in menu.Items)
-                    ((OsuMenuItem)item).Enabled.Value = false;
+                    ((OsuMenuItem)item).Action.Disabled = true;
             });
 
             AddStep("enable menu items", () =>
             {
                 foreach (var item in menu.Items)
-                    ((OsuMenuItem)item).Enabled.Value = true;
+                    ((OsuMenuItem)item).Action.Disabled = false;
             });
 
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
diff --git a/osu.Game/Graphics/UserInterface/OsuMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
index 36122ca0b2..0fe41937ce 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
@@ -2,15 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuMenuItem : MenuItem
     {
-        public readonly Bindable<bool> Enabled = new Bindable<bool>(true);
-
         public readonly MenuItemType Type;
 
         public OsuMenuItem(string text, MenuItemType type = MenuItemType.Standard)
@@ -22,9 +19,6 @@ namespace osu.Game.Graphics.UserInterface
             : base(text, action)
         {
             Type = type;
-
-            Enabled.BindValueChanged(enabled => Action.Disabled = !enabled.NewValue);
-            Action.BindDisabledChanged(disabled => Enabled.Value = !disabled);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index ad17498d93..9a1f450dc6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -107,6 +107,8 @@ namespace osu.Game.Screens.Edit
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             EditorMenuBar menuBar;
+            OsuMenuItem undoMenuItem;
+            OsuMenuItem redoMenuItem;
 
             var fileMenuItems = new List<MenuItem>
             {
@@ -155,8 +157,8 @@ namespace osu.Game.Screens.Edit
                                 {
                                     Items = new[]
                                     {
-                                        new EditorMenuItem("Undo", MenuItemType.Standard, undo) { Enabled = { BindTarget = changeHandler.CanUndo } },
-                                        new EditorMenuItem("Redo", MenuItemType.Standard, redo) { Enabled = { BindTarget = changeHandler.CanRedo } }
+                                        undoMenuItem = new EditorMenuItem("Undo", MenuItemType.Standard, undo),
+                                        redoMenuItem = new EditorMenuItem("Redo", MenuItemType.Standard, redo)
                                     }
                                 }
                             }
@@ -214,6 +216,9 @@ namespace osu.Game.Screens.Edit
                 }
             });
 
+            changeHandler.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
+            changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
+
             menuBar.Mode.ValueChanged += onModeChanged;
 
             bottomBackground.Colour = colours.Gray2;