Improve log dialog layout

Author: Hellfrosted

BetterModMenu.Tests/LogicTests.cs

@@ -1086,6 +1086,17 @@ public void FitTutorialDialogToViewport_ReservesRoomForDialogButtons()
         Assert.IsTrue(layout.PopupHeight - layout.ContentHeight >= 180);
     }
 
+    [TestMethod]
+    public void GetPreferredLogDialogLayout_ReservesVisibleActionRowOutsideScroll()
+    {
+        LogDialogLayout layout = ModdingScreenDialogRules.GetPreferredLogDialogLayout();
+
+        Assert.IsTrue(layout.ActionRowHeight >= 40);
+        Assert.IsTrue(layout.ScrollHeight < layout.PanelHeight);
+        Assert.IsTrue(layout.ScrollHeight + layout.ActionRowHeight <= layout.PanelHeight);
+        Assert.IsTrue(layout.PopupHeight > layout.PanelHeight);
+    }
+
     [TestMethod]
     public void ShouldCreateAutomaticBackup_RunsAutomaticReasonsOnceAndNeverForManual()
     {

Patches/ModdingScreenChromeOps.cs

@@ -277,23 +277,26 @@ private static void ReapplyModsScrollbarAfterFrame(NModdingScreen screen, NScrol
 
     private static void MaintainModsScrollbar(NModdingScreen screen, NScrollableContainer scrollContainer)
     {
-        ClampModsScrollIfContentFits(screen, scrollContainer);
+        if (ClampModsScrollIfContentFits(screen, scrollContainer))
+            return;
+
         ForceModsScrollbarVisible(scrollContainer);
     }
 
-    private static void ClampModsScrollIfContentFits(NModdingScreen screen, NScrollableContainer scrollContainer)
+    private static bool ClampModsScrollIfContentFits(NModdingScreen screen, NScrollableContainer scrollContainer)
     {
         var content = ModdingScreenNodeOps.GetModRowContainer(screen);
         var viewport = content?.GetParentOrNull<Control>();
         if (content == null || viewport == null)
-            return;
+            return false;
 
         content.UpdateMinimumSize();
         if (content.GetCombinedMinimumSize().Y > viewport.Size.Y + ModdingScreenConstants.ScrollFitTolerance)
-            return;
+            return false;
 
         scrollContainer.DisableScrollingIfContentFits();
         scrollContainer.InstantlyScrollToTop();
+        return true;
     }
 
     private static void ForceModsScrollbarVisible(NScrollableContainer scrollContainer)

Patches/ModdingScreenDialogRules.cs

@@ -14,8 +14,31 @@ internal readonly record struct TutorialDialogLayout(
     int ContentHorizontalPadding,
     int ContentVerticalPadding);
 
+internal readonly record struct LogDialogLayout(
+    int PopupWidth,
+    int PopupHeight,
+    int PanelWidth,
+    int PanelHeight,
+    int ScrollHeight,
+    int BodyFontSize,
+    int ButtonFontSize,
+    int ActionRowHeight);
+
 internal static class ModdingScreenDialogRules
 {
+    public static LogDialogLayout GetPreferredLogDialogLayout()
+    {
+        return new LogDialogLayout(
+            PopupWidth: 1080,
+            PopupHeight: 680,
+            PanelWidth: 1020,
+            PanelHeight: 600,
+            ScrollHeight: 540,
+            BodyFontSize: 22,
+            ButtonFontSize: 22,
+            ActionRowHeight: 44);
+    }
+
     public static TutorialDialogLayout GetPreferredTutorialDialogLayout()
     {
         return new TutorialDialogLayout(

Patches/ModdingScreenDialogs.cs

@@ -8,12 +8,6 @@ namespace BetterModMenu.Patches;
 internal static class ModdingScreenDialogs
 {
     private const int MaxVisibleBackupChoices = 12;
-    private const int LogPopupWidth = 1080;
-    private const int LogPopupHeight = 680;
-    private const int LogContentWidth = 1020;
-    private const int LogContentHeight = 600;
-    private const int LogBodyFontSize = 22;
-    private const int LogButtonFontSize = 22;
 
     public static void ShowInfoDialog(NModdingScreen screen, string title, string message)
     {
@@ -100,30 +94,26 @@ public static void ShowBackupSelectionDialog(NModdingScreen screen, IReadOnlyLis
 
     public static void ShowLogDialog(NModdingScreen screen, string title, string content, string logPath)
     {
+        LogDialogLayout layout = ModdingScreenDialogRules.GetPreferredLogDialogLayout();
         var popup = new AcceptDialog
         {
             Title = title,
             DialogText = string.Empty
         };
 
-        var scroll = new ScrollContainer
-        {
-            HorizontalScrollMode = ScrollContainer.ScrollMode.Disabled,
-            SizeFlagsHorizontal = Control.SizeFlags.ExpandFill,
-            SizeFlagsVertical = Control.SizeFlags.ExpandFill
-        };
         var panel = new PanelContainer
         {
-            CustomMinimumSize = new Vector2(LogContentWidth, LogContentHeight)
+            CustomMinimumSize = new Vector2(layout.PanelWidth, layout.PanelHeight)
         };
         ModdingScreenVanillaStyle.ApplyLogPanel(panel);
-        var contentBox = new VBoxContainer
+        var panelBox = new VBoxContainer
         {
             SizeFlagsHorizontal = Control.SizeFlags.ExpandFill,
             SizeFlagsVertical = Control.SizeFlags.ExpandFill
         };
         var actionRow = new HBoxContainer
         {
+            CustomMinimumSize = new Vector2(0, layout.ActionRowHeight),
             SizeFlagsHorizontal = Control.SizeFlags.ExpandFill
         };
         var copyButton = new Button
@@ -143,7 +133,20 @@ public static void ShowLogDialog(NModdingScreen screen, string title, string con
         ModdingScreenVanillaStyle.ApplyButton(openFolderButton);
         openFolderButton.Pressed += () => OpenLogFolder(screen, logPath);
         actionRow.AddChild(openFolderButton);
-        contentBox.AddChild(actionRow);
+        panelBox.AddChild(actionRow);
+
+        var scroll = new ScrollContainer
+        {
+            HorizontalScrollMode = ScrollContainer.ScrollMode.Disabled,
+            CustomMinimumSize = new Vector2(0, layout.ScrollHeight),
+            SizeFlagsHorizontal = Control.SizeFlags.ExpandFill,
+            SizeFlagsVertical = Control.SizeFlags.ExpandFill
+        };
+        var contentBox = new VBoxContainer
+        {
+            SizeFlagsHorizontal = Control.SizeFlags.ExpandFill,
+            SizeFlagsVertical = Control.SizeFlags.ExpandFill
+        };
 
         var label = new RichTextLabel
         {
@@ -158,15 +161,16 @@ public static void ShowLogDialog(NModdingScreen screen, string title, string con
             SizeFlagsVertical = Control.SizeFlags.ExpandFill
         };
         label.AddThemeColorOverride("default_color", new Color(0.92f, 0.86f, 0.74f, 1f));
-        label.AddThemeFontSizeOverride("font_size", LogBodyFontSize);
+        label.AddThemeFontSizeOverride("font_size", layout.BodyFontSize);
 
         contentBox.AddChild(label);
         scroll.AddChild(contentBox);
-        panel.AddChild(scroll);
+        panelBox.AddChild(scroll);
+        panel.AddChild(panelBox);
         popup.AddChild(panel);
-        ApplyReadableDialogButtons(popup, LogButtonFontSize);
+        ApplyReadableDialogButtons(popup, layout.ButtonFontSize);
         screen.AddChild(popup);
-        popup.PopupCentered(new Vector2I(LogPopupWidth, LogPopupHeight));
+        popup.PopupCentered(new Vector2I(layout.PopupWidth, layout.PopupHeight));
     }
 
     private static void OpenLogFolder(NModdingScreen screen, string logPath)