Merge remote-tracking branch 'Joehuu/master' into drawnode-composability

# Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2025-07-02 00:40:09 +09:00 · 2019-04-08 23:01:12 +09:00
parent a56e29347f f2f60f6d03
commit 772bef91fa
143 changed files with 1654 additions and 1127 deletions
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@ -64,6 +64,8 @@ namespace osu.Game.Screens.Menu
            {
                box = new Container
                {
+                    // box needs to be always present to ensure the button is always sized correctly for flow
+                    AlwaysPresent = true,
                    Masking = true,
                    MaskingSmoothness = 2,
                    EdgeEffect = new EdgeEffectParameters