From 32daf64a31a09cc459461957d0aa709c52f015f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 19:23:35 +0900
Subject: [PATCH] Use newly exposed framework helper function to find closest
 parent

---
 osu.Android.props                                |  2 +-
 .../Mods/NestedVerticalScrollContainer.cs        | 16 +---------------
 osu.Game/osu.Game.csproj                         |  2 +-
 osu.iOS.props                                    |  4 ++--
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 6a3b113fa2..a168d351fc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.325.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.405.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
index c62b52ef27..1bf965beeb 100644
--- a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
+++ b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            parentScrollContainer = findClosestParent<OsuScrollContainer>();
+            parentScrollContainer = this.FindClosestParent<OsuScrollContainer>();
         }
 
         protected override bool OnScroll(ScrollEvent e)
@@ -43,19 +43,5 @@ namespace osu.Game.Overlays.Mods
 
             return base.OnScroll(e);
         }
-
-        // TODO: remove when https://github.com/ppy/osu-framework/pull/5092 is available.
-        private T? findClosestParent<T>() where T : class, IDrawable
-        {
-            Drawable cursor = this;
-
-            while ((cursor = cursor.Parent) != null)
-            {
-                if (cursor is T match)
-                    return match;
-            }
-
-            return default;
-        }
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3c01f29671..e968c6602d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.10.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.405.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.325.0" />
     <PackageReference Include="Sentry" Version="3.14.1" />
     <PackageReference Include="SharpCompress" Version="0.30.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c8f170497d..e441ed81ab 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.405.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.325.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.405.0" />
     <PackageReference Include="SharpCompress" Version="0.30.1" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />