sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove bindable to promote one-way access

Browse Source
This commit is contained in:
smoogipoo
2020-04-16 13:25:08 +09:00
parent 06e25091f6
commit 9e2be6f2f4
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("disable menu items", () => AddStep("disable menu items", () =>
{ {
foreach (var item in 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())); 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", () => AddStep("disable menu items", () =>
{ {
foreach (var item in menu.Items) foreach (var item in menu.Items)
((OsuMenuItem)item).Enabled.Value = false; ((OsuMenuItem)item).Action.Disabled = true;
}); });
AddStep("enable menu items", () => AddStep("enable menu items", () =>
{ {
foreach (var item in 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())); AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));

6
osu.Game/Graphics/UserInterface/OsuMenuItem.cs
View File

@ -2,15 +2,12 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using osu.Framework.Bindables;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
public class OsuMenuItem : MenuItem public class OsuMenuItem : MenuItem
{ {
public readonly Bindable<bool> Enabled = new Bindable<bool>(true);
public readonly MenuItemType Type; public readonly MenuItemType Type;
public OsuMenuItem(string text, MenuItemType type = MenuItemType.Standard) public OsuMenuItem(string text, MenuItemType type = MenuItemType.Standard)
@ -22,9 +19,6 @@ namespace osu.Game.Graphics.UserInterface
: base(text, action) : base(text, action)
{ {
Type = type; Type = type;
Enabled.BindValueChanged(enabled => Action.Disabled = !enabled.NewValue);
Action.BindDisabledChanged(disabled => Enabled.Value = !disabled);
} }
} }
} }

9
osu.Game/Screens/Edit/Editor.cs
View File

@ -107,6 +107,8 @@ namespace osu.Game.Screens.Edit
dependencies.CacheAs<IEditorChangeHandler>(changeHandler); dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
EditorMenuBar menuBar; EditorMenuBar menuBar;
OsuMenuItem undoMenuItem;
OsuMenuItem redoMenuItem;
var fileMenuItems = new List<MenuItem> var fileMenuItems = new List<MenuItem>
{ {
@ -155,8 +157,8 @@ namespace osu.Game.Screens.Edit
{ {
Items = new[] Items = new[]
{ {
new EditorMenuItem("Undo", MenuItemType.Standard, undo) { Enabled = { BindTarget = changeHandler.CanUndo } }, undoMenuItem = new EditorMenuItem("Undo", MenuItemType.Standard, undo),
new EditorMenuItem("Redo", MenuItemType.Standard, redo) { Enabled = { BindTarget = changeHandler.CanRedo } } 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; menuBar.Mode.ValueChanged += onModeChanged;
bottomBackground.Colour = colours.Gray2; bottomBackground.Colour = colours.Gray2;