Merge remote-tracking branch 'upstream/master' into RefactorInputQueues

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -33,15 +33,6 @@ namespace osu.Game.Graphics.Containers
         // receive input outside our bounds so we can trigger a close event on ourselves.
         public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => BlockScreenWideMouse || base.ReceiveMouseInputAt(screenSpacePos);
 
-        protected override bool OnWheel(InputState state)
-        {
-            // always allow wheel to pass through to stuff outside our DrawRectangle.
-            if (!base.ReceiveMouseInputAt(state.Mouse.NativeState.Position))
-                return false;
-
-            return BlockPassThroughMouse;
-        }
-
         protected override bool OnClick(InputState state)
         {
             if (!base.ReceiveMouseInputAt(state.Mouse.NativeState.Position))

osu.Game/Graphics/Cursor/CursorOverrideContainer.cs

@@ -0,0 +1,67 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Input;
+
+namespace osu.Game.Graphics.Cursor
+{
+    /// <summary>
+    /// A container which provides a <see cref="MenuCursor"/> which can be overridden by hovered <see cref="Drawable"/>s.
+    /// </summary>
+    public class CursorOverrideContainer : Container, IProvideCursor
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        /// <summary>
+        /// Whether any cursors can be displayed.
+        /// </summary>
+        public bool CanShowCursor;
+
+        public CursorContainer Cursor { get; }
+        public bool ProvidingUserCursor => true;
+
+        public CursorOverrideContainer()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                Cursor = new MenuCursor { State = Visibility.Hidden },
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+        }
+
+        private InputManager inputManager;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            inputManager = GetContainingInputManager();
+        }
+
+        private IProvideCursor currentTarget;
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!CanShowCursor)
+            {
+                currentTarget?.Cursor?.Hide();
+                return;
+            }
+
+            var newTarget = inputManager.HoveredDrawables.OfType<IProvideCursor>().FirstOrDefault(t => t.ProvidingUserCursor) ?? this;
+
+            if (currentTarget == newTarget)
+                return;
+
+            currentTarget?.Cursor?.Hide();
+            newTarget.Cursor?.Show();
+
+            currentTarget = newTarget;
+        }
+    }
+}

osu.Game/Graphics/Cursor/IProvideCursor.cs

@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
+
+namespace osu.Game.Graphics.Cursor
+{
+    /// <summary>
+    /// Interface for <see cref="IDrawable"/>s that display cursors which can replace the user's cursor.
+    /// </summary>
+    public interface IProvideCursor : IDrawable
+    {
+        /// <summary>
+        /// The cursor provided by this <see cref="IDrawable"/>.
+        /// May be null if no cursor should be visible.
+        /// </summary>
+        CursorContainer Cursor { get; }
+
+        /// <summary>
+        /// Whether <see cref="Cursor"/> should be displayed as the singular user cursor. This will temporarily hide any other user cursor.
+        /// This value is checked every frame and may be used to control whether multiple cursors are displayed (e.g. watching replays).
+        /// </summary>
+        bool ProvidingUserCursor { get; }
+    }
+}

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -99,8 +99,8 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void PopOut()
         {
-            ActiveCursor.FadeTo(0, 900, Easing.OutQuint);
-            ActiveCursor.ScaleTo(0, 500, Easing.In);
+            ActiveCursor.FadeTo(0, 250, Easing.OutQuint);
+            ActiveCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
         [BackgroundDependencyLoader]

osu.Game/Graphics/UserInterface/OsuSliderBar.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Globalization;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
@@ -17,7 +18,7 @@ using osu.Framework.Graphics.Shapes;
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuSliderBar<T> : SliderBar<T>, IHasTooltip, IHasAccentColour
-        where T : struct, IEquatable<T>
+        where T : struct, IEquatable<T>, IComparable, IConvertible
     {
         private SampleChannel sample;
         private double lastSampleTime;
@@ -32,18 +33,25 @@ namespace osu.Game.Graphics.UserInterface
             get
             {
                 var bindableDouble = CurrentNumber as BindableNumber<double>;
-                if (bindableDouble != null)
+                var bindableFloat = CurrentNumber as BindableNumber<float>;
+                var floatValue = bindableDouble?.Value ?? bindableFloat?.Value;
+
+                if (floatValue != null)
                 {
-                    if (bindableDouble.MaxValue == 1 && (bindableDouble.MinValue == 0 || bindableDouble.MinValue == -1))
-                        return bindableDouble.Value.ToString(@"P0");
-                    return bindableDouble.Value.ToString(@"n1");
+                    var floatMinValue = bindableDouble?.MinValue ?? bindableFloat.MinValue;
+                    var floatMaxValue = bindableDouble?.MaxValue ?? bindableFloat.MaxValue;
+
+                    if (floatMaxValue == 1 && (floatMinValue == 0 || floatMinValue == -1))
+                        return floatValue.Value.ToString("P0");
+
+                    return floatValue.Value.ToString("N1");
                 }
 
                 var bindableInt = CurrentNumber as BindableNumber<int>;
                 if (bindableInt != null)
-                    return bindableInt.Value.ToString(@"n0");
+                    return bindableInt.Value.ToString("N0");
 
-                return Current.Value.ToString();
+                return Current.Value.ToString(CultureInfo.InvariantCulture);
             }
         }
 

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -180,7 +180,6 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
 
-
             protected class OsuTabDropdownHeader : OsuDropdownHeader
             {
                 public override Color4 AccentColour

osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs

@@ -3,12 +3,13 @@
 
 using System;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Graphics.UserInterface.Volume
 {
-    public class VolumeControlReceptor : Container, IKeyBindingHandler<GlobalAction>
+    public class VolumeControlReceptor : Container, IKeyBindingHandler<GlobalAction>, IHandleGlobalInput
     {
         public Func<GlobalAction, bool> ActionRequested;