Fix GUI layout issues with scaling

GUI/Controls/EditModSearches.cs

@@ -21,7 +21,6 @@ public EditModSearches()
         {
             InitializeComponent();
             ToolTip.SetToolTip(AddSearchButton, Properties.Resources.EditModSearchesTooltipAddSearchButton);
-            ActiveControl = AddSearch();
         }
 
         public event Action?                    SurrenderFocus;
@@ -69,6 +68,10 @@ public void SetSearches(List<ModSearch> searches)
             {
                 RemoveSearch(editors[^1]);
             }
+            if (editors.Count < 1)
+            {
+                ActiveControl = AddSearch();
+            }
             if (searches.Count < 1)
             {
                 if (//editors is [var editor]
@@ -116,8 +119,6 @@ private void AddSearchButton_Click(object? sender, EventArgs? e)
 
         private EditModSearch AddSearch()
         {
-            SuspendLayout();
-
             var ctl = new EditModSearch()
             {
                 // Dock handles the layout for us
@@ -136,9 +137,6 @@ private EditModSearch AddSearch()
             // Still need to be able to see the add button, without this it's covered up
             AddSearchButton.BringToFront();
 
-            ResumeLayout(false);
-            PerformLayout();
-
             Height = editors.Sum(ems => ems.Height);
 
             return ctl;
@@ -148,8 +146,6 @@ private void RemoveSearch(EditModSearch which)
         {
             if (editors.Count >= 2)
             {
-                SuspendLayout();
-
                 if (which == ActiveControl)
                 {
                     // Move focus to next control, or previous if last in list
@@ -169,9 +165,6 @@ private void RemoveSearch(EditModSearch which)
                     editor.ShowLabel = true;
                 }
 
-                ResumeLayout(false);
-                PerformLayout();
-
                 Height = editors.Sum(ems => ems.Height);
             }
         }

GUI/Controls/InstallationHistory.cs

@@ -19,13 +19,18 @@ public InstallationHistory()
             InitializeComponent();
         }
 
-        public void LoadHistory(GameInstance inst, GUIConfiguration config, RepositoryDataManager repoData)
+        public void LoadHistory(GameInstance          inst,
+                                GUIConfiguration      config,
+                                RepositoryDataManager repoData)
         {
-            this.inst     = inst;
-            registry = RegistryManager.Instance(inst, repoData).registry;
-            this.config   = config;
+            this.inst   = inst;
+            registry    = RegistryManager.Instance(inst, repoData).registry;
+            this.config = config;
             Util.Invoke(this, () =>
             {
+                HistoryListView.Items.Clear();
+                ModsListView.Items.Clear();
+                ModsListView.Items.Add(LoadingMessage);
                 UseWaitCursor = true;
                 Task.Factory.StartNew(() =>
                 {
@@ -38,7 +43,6 @@ public void LoadHistory(GameInstance inst, GUIConfiguration config, RepositoryDa
                     Util.Invoke(this, () =>
                     {
                         HistoryListView.BeginUpdate();
-                        HistoryListView.Items.Clear();
                         HistoryListView.Items.AddRange(items);
                         HistoryListView.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent);
                         Splitter.Panel1MinSize = Splitter.SplitterDistance =

GUI/Controls/InstallationHistory.resx

@@ -125,6 +125,7 @@
   <data name="AuthorColumn.Text" xml:space="preserve"><value>Authors</value></data>
   <data name="DescriptionColumn.Text" xml:space="preserve"><value>Description</value></data>
   <data name="SelectInstallMessage.Text" xml:space="preserve"><value>Click a timestamp at the left to see which mods were installed</value></data>
+  <data name="LoadingMessage.Text" xml:space="preserve"><value>Loading installation history...</value></data>
   <data name="NoModsMessage.Text" xml:space="preserve"><value>No mods were installed</value></data>
   <data name="InstallButton.Text" xml:space="preserve"><value>Install</value></data>
   <data name="OKButton.Text" xml:space="preserve"><value>OK</value></data>

GUI/Controls/ManageMods.cs

@@ -62,9 +62,23 @@ public ManageMods()
                 ModListContextMenuStrip.Renderer = new FlatToolStripRenderer();
                 ModListHeaderContextMenuStrip.Renderer = new FlatToolStripRenderer();
                 LabelsContextMenuStrip.Renderer = new FlatToolStripRenderer();
+
+                ModGrid.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+                ResizeColumnHeaders();
+                ModGrid.ColumnWidthChanged += (sender, e) => ResizeColumnHeaders();
             }
         }
 
+        private void ResizeColumnHeaders()
+        {
+            var g = CreateGraphics();
+            ModGrid.ColumnHeadersHeight = ModGrid.Columns.OfType<DataGridViewColumn>().Max(col =>
+                ModGrid.ColumnHeadersDefaultCellStyle.Padding.Vertical
+                + Util.StringHeight(g, col.HeaderText,
+                                    col.HeaderCell?.Style?.Font ?? ModGrid.ColumnHeadersDefaultCellStyle.Font,
+                                    col.Width - (2 * ModGrid.ColumnHeadersDefaultCellStyle.Padding.Horizontal)));
+        }
+
         private static readonly ILog log = LogManager.GetLogger(typeof(ManageMods));
         private readonly RepositoryDataManager repoData;
         private DateTime lastSearchTime;