Remove now obsolete InternalContains

osu-framework

@@ -1 +1 @@
-Subproject commit 6a81d52ba24c4c4bcd83bf1062143ad93d8f4545
+Subproject commit f832f77c04dd2c64063763a4283831ff95854aab

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

@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             };
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => true;
+        public override bool Contains(Vector2 screenSpacePos) => true;
 
         private bool tracking;
         public bool Tracking

osu.Game/Graphics/Cursor/CursorTrail.cs

@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.Cursor
             }
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => true;
+        public override bool Contains(Vector2 screenSpacePos) => true;
 
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders, TextureStore textures)

osu.Game/Graphics/UserInterface/BreadcrumbControl.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Graphics.UserInterface
             public readonly TextAwesome Chevron;
 
             //don't allow clicking between transitions and don't make the chevron clickable
-            protected override bool InternalContains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
+            public override bool Contains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
             public override bool HandleInput => State == Visibility.Visible;
 
             private Visibility state;

osu.Game/Graphics/UserInterface/DialogButton.cs

@@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private bool didClick; // Used for making sure that the OnMouseDown animation can call instead of OnHoverLost's when clicking
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
 
         protected override bool OnClick(Framework.Input.InputState state)
         {

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem(value);
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
 
         private bool isEnumType => typeof(T).IsEnum;
 

osu.Game/Graphics/UserInterface/TwoLayerButton.cs

@@ -171,7 +171,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
 
         protected override bool OnHover(InputState state)
         {

osu.Game/Overlays/ChatOverlay.cs

@@ -59,7 +59,7 @@ namespace osu.Game.Overlays
         private readonly Container channelSelectionContainer;
         private readonly ChannelSelectionOverlay channelSelection;
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.Contains(screenSpacePos);
 
         public ChatOverlay()
         {

osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.SearchableList
         protected abstract T DefaultTab { get; }
         protected virtual Drawable CreateSupplementaryControls() => null;
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || DisplayStyleControl.Dropdown.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || DisplayStyleControl.Dropdown.Contains(screenSpacePos);
 
         protected SearchableListFilterControl()
         {

osu.Game/Screens/Menu/Button.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Menu
         private readonly Key triggerKey;
         private SampleChannel sampleClick;
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
 
         public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
         {

osu.Game/Screens/Menu/OsuLogo.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
             set { colourAndTriangles.Alpha = value ? 1 : 0; }
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
 
         public bool Ripple
         {

osu.Game/Screens/Play/KeyCounterCollection.cs

@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Play
                 this.target = target;
             }
 
-            protected override bool InternalContains(Vector2 screenSpacePos) => true;
+            public override bool Contains(Vector2 screenSpacePos) => true;
 
             public override bool HandleInput => true;
 

osu.Game/Screens/Play/KeyCounterMouse.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play
             Button = button;
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => true;
+        public override bool Contains(Vector2 screenSpacePos) => true;
 
         private static string getStringRepresentation(MouseButton button)
         {

osu.Game/Screens/Select/FilterControl.cs

@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
 
         private readonly SearchTextBox searchTextBox;
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
 
         public FilterControl()
         {

osu.Game/Screens/Select/Footer.cs

@@ -124,7 +124,7 @@ namespace osu.Game.Screens.Select
             updateModeLight();
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || StartButton.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || StartButton.Contains(screenSpacePos);
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
 

osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs

@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Select.Options
             return false;
         }
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
 
         public BeatmapOptionsButton()
         {