Minor fixes related to #1027 and fixed #1019

FetchXmlBuilder/DockControls/ResultGrid.cs

@@ -98,7 +98,7 @@ internal void ApplySettingsToGrid()
             mnuShowAllCol.Visible = form.settings.Results.WorkWithLayout;
             mnuShowLayoutXML.Visible = form.settings.Results.WorkWithLayout;
 
-            if (!form.settings.Results.WorkWithLayout)
+            if (!form.settings.Results.WorkWithLayout && crmGridView1.LayoutXML != null)
             {
                 crmGridView1.LayoutXML = null;
             }
@@ -145,9 +145,9 @@ private void RefreshData()
             }
             reloaded = true;
             crmGridView1.SuspendLayout();
-            crmGridView1.Refresh();
             if (form.dockControlBuilder.LayoutXML == null)
             {
+                crmGridView1.Refresh();
                 ShowHiddenColumns();
                 crmGridView1.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
             }
@@ -190,10 +190,11 @@ internal void SetLayoutToGrid()
             {
                 return;
             }
+            var tmpreloaded = reloaded;
             reloaded = true;
             crmGridView1.LayoutXML = form.dockControlBuilder?.LayoutXML?.ToXML();
             crmGridView1.Refresh();
-            reloaded = false;
+            reloaded = tmpreloaded;
         }
 
         private void GetLayoutFromGrid()
@@ -346,7 +347,7 @@ private void ctxCopy_Click(object sender, EventArgs e)
 
         private void crmGridView1_LayoutChanged(object sender, DataGridViewColumnEventArgs e)
         {
-            if (!reloaded)
+            if (!reloaded && !crmGridView1.SettingsWidths)
             {
                 GetLayoutFromGrid();
             }
@@ -435,5 +436,13 @@ private void mnuShowLayoutXML_Click(object sender, EventArgs e)
         {
             form.ShowLayoutXML();
         }
+
+        private void crmGridView1_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
+        {
+            if (!reloaded)
+            {
+                GetLayoutFromGrid();
+            }
+        }
     }
 }