Hide cursor when inactive in visualizer screen

Author: EVAST9919

osu.Game.Rulesets.Sandbox/Screens/SandboxScreenWithSettings.cs

@@ -1,4 +1,5 @@
-using osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Sandbox.UI.Settings;
@@ -8,6 +9,7 @@ namespace osu.Game.Rulesets.Sandbox.Screens
     public abstract class SandboxScreenWithSettings : SandboxScreen
     {
         private readonly SandboxSettings settings;
+        protected readonly BindableBool SettingsVisible = new BindableBool();
 
         public SandboxScreenWithSettings()
         {
@@ -43,6 +45,8 @@ public SandboxScreenWithSettings()
                     }
                 }
             });
+
+            SettingsVisible.BindTo(settings.IsVisible);
         }
 
         protected abstract Drawable CreateContent();
@@ -55,14 +59,14 @@ protected override bool OnMouseMove(MouseMoveEvent e)
         {
             base.OnMouseMove(e);
 
-            if (settings.IsVisible.Value)
+            if (SettingsVisible.Value)
                 return false;
 
             var cursorPosition = ToLocalSpace(e.CurrentState.Mouse.Position);
 
             if (cursorPosition.X > DrawWidth - 5)
             {
-                settings.IsVisible.Value = true;
+                SettingsVisible.Value = true;
                 return true;
             }
 
@@ -71,11 +75,17 @@ protected override bool OnMouseMove(MouseMoveEvent e)
 
         protected override bool OnClick(ClickEvent e)
         {
-            if (!settings.IsVisible.Value)
+            if (!SettingsVisible.Value)
                 return false;
 
-            settings.IsVisible.Value = false;
+            SettingsVisible.Value = false;
             return true;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            SettingsVisible.UnbindFrom(settings.IsVisible);
+            base.Dispose(isDisposing);
+        }
     }
 }

osu.Game.Rulesets.Sandbox/Screens/Visualizer/VisualizerScreen.cs

@@ -2,15 +2,19 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Sandbox.Configuration;
 using osu.Game.Rulesets.Sandbox.Screens.Visualizer.Components;
 using osu.Game.Rulesets.Sandbox.Screens.Visualizer.Components.Settings;
 using osu.Game.Rulesets.Sandbox.UI;
 using osu.Game.Rulesets.Sandbox.UI.Settings;
+using osuTK;
 
 namespace osu.Game.Rulesets.Sandbox.Screens.Visualizer
 {
@@ -20,12 +24,15 @@ public class VisualizerScreen : SandboxScreenWithSettings, IKeyBindingHandler<Gl
 
         public override bool HideOverlaysOnEnter => true;
 
+        private readonly IBindable<bool> isIdle = new BindableBool();
         private readonly BindableBool showTip = new BindableBool();
+        private CursorHider cursorHider;
 
         [BackgroundDependencyLoader]
-        private void load(SandboxRulesetConfigManager config)
+        private void load(SandboxRulesetConfigManager config, IdleTracker idleTracker)
         {
             config.BindWith(SandboxRulesetSetting.ShowSettingsTip, showTip);
+            isIdle.BindTo(idleTracker.IsIdle);
         }
 
         protected override void LoadComplete()
@@ -38,6 +45,21 @@ protected override void LoadComplete()
                 AddInternal(tip);
                 tip.Show();
             }
+
+            AddInternal(cursorHider = new CursorHider());
+
+            isIdle.BindValueChanged(idle =>
+            {
+                if (idle.NewValue)
+                {
+                    SettingsVisible.Value = false;
+                    cursorHider.Size = Vector2.One;
+                }
+                else
+                {
+                    cursorHider.Size = Vector2.Zero;
+                }
+            });
         }
 
         protected override Drawable CreateBackground() => new Container
@@ -74,5 +96,29 @@ public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
         {
         }
+
+        private class CursorHider : CompositeDrawable, IProvideCursor
+        {
+            public CursorHider()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Size = Vector2.Zero;
+            }
+
+            public CursorContainer Cursor => new EmptyCursor();
+
+            public bool ProvidingUserCursor => true;
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                base.OnHover(e);
+                return true;
+            }
+
+            private class EmptyCursor : CursorContainer
+            {
+                protected override Drawable CreateCursor() => Empty();
+            }
+        }
     }
 }

osu.Game.Rulesets.Sandbox/osu.Game.Rulesets.Sandbox.csproj

@@ -11,6 +11,6 @@
     <EmbeddedResource Include="Resources\**\*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.1120.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.1127.0" />
   </ItemGroup>
 </Project>