Merge branch 'master' into beatmap_timinginfo

osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs

@@ -28,6 +28,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         public DrawableSlider(Slider s) : base(s)
         {
+            // Since the DrawableSlider itself is just a container without a size we need to
+            // pass all input through.
+            AlwaysReceiveInput = true;
+
             SliderBouncer bouncer1;
             slider = s;
 
@@ -91,10 +95,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             }
         }
 
-        // Since the DrawableSlider itself is just a container without a size we need to
-        // pass all input through.
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
         private int currentRepeat;
 
         protected override void Update()

osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -24,6 +24,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         public DrawableSpinner(Spinner s) : base(s)
         {
+            AlwaysReceiveInput = true;
+
             Origin = Anchor.Centre;
             Position = s.Position;
 
@@ -69,8 +71,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             disc.Scale = scaleToCircle;
         }
 
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
         protected override void CheckJudgement(bool userTriggered)
         {
             if (Time.Current < HitObject.StartTime) return;

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs

@@ -19,8 +19,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class SpinnerDisc : CircularContainer
     {
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
         protected Sprite Disc;
 
         public SRGBColour DiscColour
@@ -101,6 +99,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 
         public SpinnerDisc()
         {
+            AlwaysReceiveInput = true;
+
             RelativeSizeAxes = Axes.Both;
 
             Children = new Drawable[]