Merge pull request #32349 from bdach/text-flow-broke

Fix `OsuTextFlowContainer.AddArbitraryDrawable()` not aligning the drawable correctly

Author: peppy

osu.Android.props

@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.311.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.313.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

osu.Game/Graphics/Containers/OsuTextFlowContainer.cs

@@ -21,8 +21,18 @@ public OsuTextFlowContainer(Action<SpriteText> defaultCreationParameters = null)
 
         protected override SpriteText CreateSpriteText() => new OsuSpriteText();
 
-        public ITextPart AddArbitraryDrawable(Drawable drawable) => AddPart(new TextPartManual(drawable.Yield()));
+        public ITextPart AddArbitraryDrawable(Drawable drawable) => AddPart(new TextPartManual(new ArbitraryDrawableWrapper { Child = drawable }.Yield()));
 
         public ITextPart AddIcon(IconUsage icon, Action<SpriteText> creationParameters = null) => AddText(icon.Icon.ToString(), creationParameters);
+
+        private partial class ArbitraryDrawableWrapper : Container, IHasLineBaseHeight
+        {
+            public float LineBaseHeight => DrawHeight;
+
+            public ArbitraryDrawableWrapper()
+            {
+                AutoSizeAxes = Axes.Both;
+            }
+        }
     }
 }

osu.Game/osu.Game.csproj

@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="20.1.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2025.311.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2025.313.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2025.307.0" />
     <PackageReference Include="Sentry" Version="5.1.1" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

osu.iOS.props

@@ -17,6 +17,6 @@
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2025.311.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2025.313.0" />
   </ItemGroup>
 </Project>