Merge pull request #508 from Tom94/hide-cursor

Hide cursor

osu.Desktop.Tests/osu.Desktop.Tests.csproj

@@ -105,6 +105,9 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Platform;
 using osu.Framework.Screens.Testing;
 using osu.Game;
 using osu.Game.Screens.Backgrounds;
@@ -19,5 +20,11 @@ namespace osu.Desktop.VisualTests
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
         }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            host.Window.CursorState = CursorState.Hidden;
+        }
     }
 }

osu.Desktop/OsuGameDesktop.cs

@@ -43,6 +43,8 @@ namespace osu.Desktop
             var desktopWindow = host.Window as DesktopGameWindow;
             if (desktopWindow != null)
             {
+                desktopWindow.CursorState = CursorState.Hidden;
+
                 desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
                 desktopWindow.Title = Name;
 

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -20,6 +20,25 @@ namespace osu.Game.Graphics.Cursor
     {
         protected override Drawable CreateCursor() => new Cursor();
 
+        protected override bool OnMouseMove(InputState state)
+        {
+            if (state.Mouse.HasMainButtonPressed)
+            {
+                Vector2 offset = state.Mouse.Position - state.Mouse.PositionMouseDown ?? state.Mouse.Delta;
+                float degrees = (float)MathHelper.RadiansToDegrees(Math.Atan2(-offset.X, offset.Y)) + 24.3f;
+
+                // Always rotate in the direction of least distance
+                float diff = (degrees - ActiveCursor.Rotation) % 360;
+                if (diff < -180) diff += 360;
+                if (diff > 180) diff -= 360;
+                degrees = ActiveCursor.Rotation + diff;
+
+                ActiveCursor.RotateTo(degrees, 600, EasingTypes.OutQuint);
+            }
+
+            return base.OnMouseMove(state);
+        }
+
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
             ActiveCursor.Scale = new Vector2(1);
@@ -35,7 +54,7 @@ namespace osu.Game.Graphics.Cursor
             if (!state.Mouse.HasMainButtonPressed)
             {
                 ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint);
-                ActiveCursor.RotateTo(0, 200, EasingTypes.OutQuint);
+                ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), EasingTypes.OutElasticHalf);
                 ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic);
             }
 
@@ -49,12 +68,6 @@ namespace osu.Game.Graphics.Cursor
             return base.OnClick(state);
         }
 
-        protected override bool OnDragStart(InputState state)
-        {
-            ActiveCursor.RotateTo(-30, 600, EasingTypes.OutElastic);
-            return base.OnDragStart(state);
-        }
-
         protected override void PopIn()
         {
             ActiveCursor.FadeTo(1, 250, EasingTypes.OutQuint);

osu.Game/Overlays/MusicController.cs

@@ -65,7 +65,7 @@ namespace osu.Game.Overlays
             Vector2 change = state.Mouse.Position - state.Mouse.PositionMouseDown.Value;
 
             // Diminish the drag distance as we go further to simulate "rubber band" feeling.
-            change *= (float)Math.Pow(change.Length, 0.7f) / change.Length;
+            change *= change.Length <= 0 ? 0 : (float)Math.Pow(change.Length, 0.7f) / change.Length;
 
             dragContainer.MoveTo(change);
             return base.OnDrag(state);

osu.Game/Screens/Menu/Disclaimer.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Menu
 
         internal override bool ShowOverlays => false;
 
-        internal override bool HasLocalCursorDisplayed => false;
+        internal override bool HasLocalCursorDisplayed => true;
 
         public Disclaimer()
         {