From 29418226c05eda74d72875441656683e65989b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Oct 2024 15:32:25 +0200
Subject: [PATCH 1/2] Do not add checkbox padding to the left of menu items if
 no item actually needs it

RFC. As per
https://discord.com/channels/188630481301012481/188630652340404224/1291346164976980009.

The diff is extremely dumb but I tried a few smarter methods and they're
either not fully correct or don't work. Primary problem is that menu
items are mutable externally and there's no hook provided by the
framework to know that items changed. One could probably be made but I'd
prefer that this change be examined visually first before I engage in
too much ceremony and start changing framework around.
---
 .../Graphics/UserInterface/DrawableOsuMenuItem.cs     |  6 ++++++
 osu.Game/Graphics/UserInterface/OsuMenu.cs            | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index 20de8e3c9f..cd44bd8fb9 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -26,6 +27,8 @@ namespace osu.Game.Graphics.UserInterface
         public const int TEXT_SIZE = 17;
         public const int TRANSITION_LENGTH = 80;
 
+        public BindableBool ShowCheckbox { get; } = new BindableBool();
+
         private TextContainer text;
         private HotkeyDisplay hotkey;
         private HoverClickSounds hoverClickSounds;
@@ -72,6 +75,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.LoadComplete();
 
+            ShowCheckbox.BindValueChanged(_ => updateState());
             Item.Action.BindDisabledChanged(_ => updateState(), true);
             FinishTransforms();
         }
@@ -138,6 +142,8 @@ namespace osu.Game.Graphics.UserInterface
                 text.BoldText.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
                 text.NormalText.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
             }
+
+            text.CheckboxContainer.Alpha = ShowCheckbox.Value ? 1 : 0;
         }
 
         protected sealed override Drawable CreateContent() => text = CreateTextContainer();
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
index 2b9a26166f..719100e138 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -42,6 +43,16 @@ namespace osu.Game.Graphics.UserInterface
             sampleClose = audio.Samples.Get(@"UI/dropdown-close");
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            bool showCheckboxes = Items.Any(i => i is StatefulMenuItem);
+
+            foreach (var drawableItem in ItemsContainer.OfType<DrawableOsuMenuItem>())
+                drawableItem.ShowCheckbox.Value = showCheckboxes;
+        }
+
         protected override void AnimateOpen()
         {
             if (!TopLevelMenu && !wasOpened)

From e136568a18785f45d42a3d0590c5cdc1ea05215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 4 Oct 2024 11:25:21 +0200
Subject: [PATCH 2/2] Remove linq usage to kill allocations

---
 osu.Game/Graphics/UserInterface/OsuMenu.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
index 719100e138..6e7dad2b5f 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -47,10 +46,19 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.Update();
 
-            bool showCheckboxes = Items.Any(i => i is StatefulMenuItem);
+            bool showCheckboxes = false;
 
-            foreach (var drawableItem in ItemsContainer.OfType<DrawableOsuMenuItem>())
-                drawableItem.ShowCheckbox.Value = showCheckboxes;
+            foreach (var drawableItem in ItemsContainer)
+            {
+                if (drawableItem.Item is StatefulMenuItem)
+                    showCheckboxes = true;
+            }
+
+            foreach (var drawableItem in ItemsContainer)
+            {
+                if (drawableItem is DrawableOsuMenuItem osuItem)
+                    osuItem.ShowCheckbox.Value = showCheckboxes;
+            }
         }
 
         protected override void AnimateOpen()