fix: preserve grouping controls on narrow mod rows

Author: Hellfrosted

BetterModMenu.Tests/LogicTests.cs

@@ -509,6 +509,22 @@ public void GetTopBarPresentation_UsesIconOnlyActions()
         Assert.AreEqual(ModdingScreenConstants.TopBarButtonCompactWidth, wide.ButtonWidth);
     }
 
+    [TestMethod]
+    public void ShouldShowRowMoveButtons_PreservesGroupPickerOnNarrowRows()
+    {
+        const float compactControlsWidth = 184f;
+        const float exactThreshold =
+            compactControlsWidth +
+            ModdingScreenConstants.RowControlsRightPadding +
+            ModdingScreenConstants.RowNativeTickboxReserveWidth +
+            ModdingScreenConstants.RowMinimumCompactLeftContentWidth;
+
+        Assert.IsFalse(ModdingScreenLayoutRules.ShouldShowRowMoveButtons(rowWidth: 270f, compactControlsWidth));
+        Assert.IsFalse(ModdingScreenLayoutRules.ShouldShowRowMoveButtons(rowWidth: exactThreshold - 1f, compactControlsWidth));
+        Assert.IsTrue(ModdingScreenLayoutRules.ShouldShowRowMoveButtons(rowWidth: exactThreshold, compactControlsWidth));
+        Assert.IsTrue(ModdingScreenLayoutRules.ShouldShowRowMoveButtons(rowWidth: 0f, compactControlsWidth));
+    }
+
     [TestMethod]
     public void Localization_UsesSts2LanguageCodesPlusVietnamese()
     {

BetterModMenu.json

@@ -3,7 +3,7 @@
   "name": "Better Mod Menu",
   "author": "Crunch",
   "description": "Adds profile and grouping functionality to the Slay the Spire 2 mod manager.",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "min_game_version": "0.107.1",
   "has_pck": false,
   "has_dll": true,

Patches/ModdingScreenConstants.cs

@@ -34,9 +34,11 @@ internal static class ModdingScreenConstants
     public const float RowButtonSize = 32f;
     public const float RowDropdownWidth = 140f;
     public const float RowDropdownCompactWidth = 112f;
+    public const float RowDropdownNarrowWidth = 80f;
     public const float RowControlsRightPadding = 12f;
     public const float RowNativeTickboxReserveWidth = 84f;
     public const float RowMinimumLeftContentWidth = 480f;
+    public const float RowMinimumCompactLeftContentWidth = 160f;
     public const float RowGameplayIndicatorSlotWidth = 22f;
     public const float RowGameplayIndicatorSize = 14f;
     public const float GroupHeaderIconButtonSize = 34f;

Patches/ModdingScreenLayoutRules.cs

@@ -12,6 +12,13 @@ internal readonly record struct TopBarPresentation(
 
 internal static class ModdingScreenLayoutRules
 {
+    public static bool ShouldShowRowMoveButtons(float rowWidth, float controlsWidth)
+    {
+        float trailingInset = ModdingScreenConstants.RowControlsRightPadding + ModdingScreenConstants.RowNativeTickboxReserveWidth;
+        return rowWidth <= 0 ||
+               rowWidth - trailingInset - controlsWidth >= ModdingScreenConstants.RowMinimumCompactLeftContentWidth;
+    }
+
     public static TopBarPresentation GetTopBarPresentation(bool isCompact)
     {
         return new TopBarPresentation(

Patches/NModMenuRowPatch.cs

@@ -104,8 +104,8 @@ public static void Postfix_Ready(NModMenuRow __instance)
 
         container.AddChild(groupDropdown);
 
-        __instance.Resized += () => UpdateCustomControlsLayout(__instance, container, groupDropdown);
-        Callable.From(() => UpdateCustomControlsLayout(__instance, container, groupDropdown)).CallDeferred();
+        __instance.Resized += () => UpdateCustomControlsLayout(__instance, container, upBtn, downBtn, groupDropdown);
+        Callable.From(() => UpdateCustomControlsLayout(__instance, container, upBtn, downBtn, groupDropdown)).CallDeferred();
     }
 
     internal static void RefreshVisibleModNames(NModdingScreen screen)
@@ -347,7 +347,12 @@ private static void RemoveColoredNameLabel(Node root)
         return null;
     }
 
-    private static void UpdateCustomControlsLayout(NModMenuRow row, HBoxContainer container, OptionButton groupDropdown)
+    private static void UpdateCustomControlsLayout(
+        NModMenuRow row,
+        HBoxContainer container,
+        Button upButton,
+        Button downButton,
+        OptionButton groupDropdown)
     {
         if (!GodotObject.IsInstanceValid(row) || !GodotObject.IsInstanceValid(container))
             return;
@@ -361,6 +366,15 @@ private static void UpdateCustomControlsLayout(NModMenuRow row, HBoxContainer co
             groupDropdown.CustomMinimumSize = new Vector2(ModdingScreenConstants.RowDropdownCompactWidth, ModdingScreenConstants.ToolbarControlHeight);
         }
 
+        upButton.Visible = true;
+        downButton.Visible = true;
+        float compactControlsWidth = container.GetCombinedMinimumSize().X;
+        bool showMoveButtons = ModdingScreenLayoutRules.ShouldShowRowMoveButtons(row.Size.X, compactControlsWidth);
+        upButton.Visible = showMoveButtons;
+        downButton.Visible = showMoveButtons;
+        if (!showMoveButtons)
+            groupDropdown.CustomMinimumSize = new Vector2(ModdingScreenConstants.RowDropdownNarrowWidth, ModdingScreenConstants.ToolbarControlHeight);
+
         float width = container.GetCombinedMinimumSize().X;
         float height = container.GetCombinedMinimumSize().Y;
         container.SetAnchorsPreset(Control.LayoutPreset.CenterRight);