Merge pull request #30101 from bdach/menu-padding-left

Do not add checkbox padding to the left of menu items if no item actually needs it
ppy · Oct 4, 2024 · 96b6780 · 96b6780
2 parents 4fc0aae + e136568
commit 96b6780
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git 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 @@ public partial class DrawableOsuMenuItem : Menu.DrawableMenuItem
         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 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            ShowCheckbox.BindValueChanged(_ => updateState());
             Item.Action.BindDisabledChanged(_ => updateState(), true);
             FinishTransforms();
         }
@@ -138,6 +142,8 @@ private void updateState()
                 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
@@ -42,6 +42,25 @@ private void load(AudioManager audio)
             sampleClose = audio.Samples.Get(@"UI/dropdown-close");
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            bool showCheckboxes = false;
+
+            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()
         {
             if (!TopLevelMenu && !wasOpened)