ConfigRawParams: fix search slowdown

ArduPilot · Jul 18, 2023 · 22af776 · 22af776
1 parent 8104697
commit 22af776
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs b/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs
diff --git a/GCSViews/ConfigurationView/ConfigRawParams.cs b/GCSViews/ConfigurationView/ConfigRawParams.cs
@@ -1,4 +1,4 @@
-using log4net;
+using log4net;
 using MissionPlanner.Controls;
 using MissionPlanner.Utilities;
 using System;
@@ -588,9 +588,8 @@ internal void processToScreen()
 
             log.Info("about to add all");
 
-            Params.SuspendLayout();
+            SuspendParamGridView();
             Params.Visible = false;
-            Params.Enabled = false;
 
             Params.Rows.AddRange(rowlist.ToArray());
 
@@ -600,9 +599,8 @@ internal void processToScreen()
 
             Params.Sort(Params.Columns[Command.Index], ListSortDirection.Ascending);
 
-            Params.Enabled = true;
             Params.Visible = true;
-            Params.ResumeLayout();
+            ResumeParamGridView();
 
             if (splitContainer1.Panel1Collapsed == false)
             {
@@ -712,8 +710,7 @@ private void updatedefaultlist(object crap)
         void filterList(string searchfor)
         {
             DateTime start = DateTime.Now;
-            Params.SuspendLayout();
-            Params.Enabled = false;
+            SuspendParamGridView();
             if (searchfor.Length >= 2 || searchfor.Length == 0)
             {
                 Regex filter = new Regex(searchfor.Replace("*", ".*").Replace("..*", ".*"), RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline);
@@ -762,8 +759,7 @@ void filterList(string searchfor)
                 }
             }
 
-            Params.Enabled = true;
-            Params.ResumeLayout();
+            ResumeParamGridView();
 
             log.InfoFormat("Filter: {0}ms", (DateTime.Now - start).TotalMilliseconds);
         }
@@ -1171,6 +1167,20 @@ private void Params_ColumnWidthChanged(object sender, DataGridViewColumnEventArg
                 optionsControlUpateBounds();
             }
         }
+
+        void SuspendParamGridView()
+        {
+            Params.SuspendLayout();
+            Params.Enabled = false;
+            Params.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None;
+        }
+
+        void ResumeParamGridView()
+        {
+            Params.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
+            Params.Enabled = true;
+            Params.ResumeLayout();
+        }
     }
 
 }