Merge branch 'master' of https://github.com/ppy/osu

osu.Game.Tests/Visual/TestCaseOnScreenDisplay.cs

@@ -4,6 +4,8 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
+using osu.Framework.Configuration.Tracking;
+using osu.Framework.Graphics;
 using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual
@@ -11,36 +13,82 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseOnScreenDisplay : OsuTestCase
     {
-        private FrameworkConfigManager config;
-        private Bindable<FrameSync> frameSyncMode;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Add(new OnScreenDisplay());
-
-            frameSyncMode = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync);
-
-            FrameSync initial = frameSyncMode.Value;
-
-            AddRepeatStep(@"Change frame limiter", setNextMode, 3);
-
-            AddStep(@"Restore frame limiter", () => frameSyncMode.Value = initial);
-        }
-
-        private void setNextMode()
-        {
-            var nextMode = frameSyncMode.Value + 1;
-            if (nextMode > FrameSync.Unlimited)
-                nextMode = FrameSync.VSync;
-            frameSyncMode.Value = nextMode;
-        }
-
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager config)
+        private void load()
         {
-            this.config = config;
+            var config = new TestConfigManager();
+
+            var osd = new TestOnScreenDisplay();
+            osd.BeginTracking(this, config);
+            Add(osd);
+
+            AddRepeatStep("Change toggle (no bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingNoKeybind), 2);
+            AddRepeatStep("Change toggle (with bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingWithKeybind), 2);
+            AddRepeatStep("Change enum (no bind)", () => config.IncrementEnumSetting(TestConfigSetting.EnumSettingNoKeybind), 3);
+            AddRepeatStep("Change enum (with bind)", () => config.IncrementEnumSetting(TestConfigSetting.EnumSettingWithKeybind), 3);
+        }
+
+        private class TestConfigManager : ConfigManager<TestConfigSetting>
+        {
+            public TestConfigManager()
+            {
+                InitialiseDefaults();
+            }
+
+            protected override void InitialiseDefaults()
+            {
+                Set(TestConfigSetting.ToggleSettingNoKeybind, false);
+                Set(TestConfigSetting.EnumSettingNoKeybind, EnumSetting.Setting1);
+                Set(TestConfigSetting.ToggleSettingWithKeybind, false);
+                Set(TestConfigSetting.EnumSettingWithKeybind, EnumSetting.Setting1);
+
+                base.InitialiseDefaults();
+            }
+
+            public void ToggleSetting(TestConfigSetting setting) => Set(setting, !Get<bool>(setting));
+
+            public void IncrementEnumSetting(TestConfigSetting setting)
+            {
+                var nextValue = Get<EnumSetting>(setting) + 1;
+                if (nextValue > EnumSetting.Setting4)
+                    nextValue = EnumSetting.Setting1;
+                Set(setting, nextValue);
+            }
+
+            public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
+            {
+                new TrackedSetting<bool>(TestConfigSetting.ToggleSettingNoKeybind, b => new SettingDescription(b, "toggle setting with no keybind", b ? "enabled" : "disabled")),
+                new TrackedSetting<EnumSetting>(TestConfigSetting.EnumSettingNoKeybind, v => new SettingDescription(v, "enum setting with no keybind", v.ToString())),
+                new TrackedSetting<bool>(TestConfigSetting.ToggleSettingWithKeybind, b => new SettingDescription(b, "toggle setting with keybind", b ? "enabled" : "disabled", "fake keybind")),
+                new TrackedSetting<EnumSetting>(TestConfigSetting.EnumSettingWithKeybind, v => new SettingDescription(v, "enum setting with keybind", v.ToString(), "fake keybind")),
+            };
+
+            protected override void PerformLoad()
+            {
+            }
+
+            protected override bool PerformSave() => false;
+        }
+
+        private enum TestConfigSetting
+        {
+            ToggleSettingNoKeybind,
+            EnumSettingNoKeybind,
+            ToggleSettingWithKeybind,
+            EnumSettingWithKeybind
+        }
+
+        private enum EnumSetting
+        {
+            Setting1,
+            Setting2,
+            Setting3,
+            Setting4
+        }
+
+        private class TestOnScreenDisplay : OnScreenDisplay
+        {
+            protected override void Display(Drawable toDisplay) => toDisplay.FadeIn().ResizeHeightTo(110);
         }
     }
 }

osu.Game/Configuration/OsuConfigManager.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Configuration;
+using osu.Framework.Configuration.Tracking;
 using osu.Framework.Platform;
 using osu.Game.Overlays;
 using osu.Game.Screens.Select;
@@ -95,6 +96,11 @@ namespace osu.Game.Configuration
         public OsuConfigManager(Storage storage) : base(storage)
         {
         }
+
+        public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
+        {
+            new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled"))
+        };
     }
 
     public enum OsuSetting

osu.Game/Input/Bindings/GlobalActionContainer.cs

@@ -26,7 +26,8 @@ namespace osu.Game.Input.Bindings
         {
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
-            new KeyBinding(InputKey.F12,GlobalAction.TakeScreenshot),
+            new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
+            new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
 
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
@@ -76,6 +77,8 @@ namespace osu.Game.Input.Bindings
         QuickRetry,
 
         [Description("Take screenshot")]
-        TakeScreenshot
+        TakeScreenshot,
+        [Description("Toggle gameplay mouse buttons")]
+        ToggleGameplayMouseButtons,
     }
 }

osu.Game/OsuGame.cs

@@ -466,6 +466,9 @@ namespace osu.Game
                 case GlobalAction.ToggleDirect:
                     direct.ToggleVisibility();
                     return true;
+                case GlobalAction.ToggleGameplayMouseButtons:
+                    LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
+                    return true;
             }
 
             return false;

osu.Game/Overlays/OnScreenDisplay.cs

@@ -14,6 +14,7 @@ using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays
@@ -30,6 +31,7 @@ namespace osu.Game.Overlays
         private readonly SpriteText textLine3;
 
         private const float height = 110;
+        private const float height_notext = 98;
         private const float height_contracted = height * 0.9f;
 
         private readonly FillFlowContainer<OptionLight> optionLights;
@@ -101,12 +103,12 @@ namespace osu.Game.Overlays
                                 },
                                 textLine3 = new OsuSpriteText
                                 {
-                                    Padding = new MarginPadding { Bottom = 15 },
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Margin = new MarginPadding { Bottom = 15 },
                                     Font = @"Exo2.0-Bold",
                                     TextSize = 12,
                                     Alpha = 0.3f,
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
                                 },
                             }
                         }
@@ -116,9 +118,10 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager osuConfig)
         {
             BeginTracking(this, frameworkConfig);
+            BeginTracking(this, osuConfig);
         }
 
         private readonly Dictionary<(object, IConfigManager), TrackedSettings> trackedConfigManagers = new Dictionary<(object, IConfigManager), TrackedSettings>();
@@ -175,13 +178,10 @@ namespace osu.Game.Overlays
                 textLine2.Text = description.Value;
                 textLine3.Text = description.Shortcut.ToUpper();
 
-                box.Animate(
+                if (string.IsNullOrEmpty(textLine3.Text))
-                    b => b.FadeIn(500, Easing.OutQuint),
+                    textLine3.Text = "NO KEY BOUND";
-                    b => b.ResizeHeightTo(height, 500, Easing.OutQuint)
+
-                ).Then(
+                Display(box);
-                    b => b.FadeOutFromOne(1500, Easing.InQuint),
-                    b => b.ResizeHeightTo(height_contracted, 1500, Easing.InQuint)
-                );
 
                 int optionCount = 0;
                 int selectedOption = -1;
@@ -213,6 +213,17 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected virtual void Display(Drawable toDisplay)
+        {
+            toDisplay.Animate(
+                b => b.FadeIn(500, Easing.OutQuint),
+                b => b.ResizeHeightTo(height, 500, Easing.OutQuint)
+            ).Then(
+                b => b.FadeOutFromOne(1500, Easing.InQuint),
+                b => b.ResizeHeightTo(height_contracted, 1500, Easing.InQuint)
+            );
+        }
+
         private class OptionLight : Container
         {
             private Color4 glowingColour, idleColour;