Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs =================================================================== diff -u -r0dd252090f721cdb4bd831fe473d698d2ddac82c -r1ed0efd36c1ce833b744e1909c445de918cffcbb --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 0dd252090f721cdb4bd831fe473d698d2ddac82c) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 1ed0efd36c1ce833b744e1909c445de918cffcbb) @@ -54,6 +54,7 @@ { private const int numberOfFixedColumns = 19; private readonly Observer assessmentSectionResultObserver; + private bool suspendDueToAddingColumns; /// /// Creates a new instance of . @@ -89,6 +90,8 @@ base.OnLoad(e); InitializeDataGridView(); + + dataGridViewControl.CellFormatting += HandleCellStyling; } protected override void Dispose(bool disposing) @@ -118,6 +121,11 @@ private void HandleCellStyling(object sender, DataGridViewCellFormattingEventArgs e) { + if (suspendDueToAddingColumns) + { + return; + } + dataGridViewControl.FormatCellWithColumnStateDefinition(e.RowIndex, e.ColumnIndex); if (e.ColumnIndex >= numberOfFixedColumns) @@ -130,6 +138,8 @@ private void InitializeDataGridView() { + suspendDueToAddingColumns = true; + dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.SectionNumber), Resources.SectionNumber_DisplayName, true); @@ -190,15 +200,13 @@ SetSpecificFailurePathTextBoxColumns(); + suspendDueToAddingColumns = false; + SetDataSource(); - - dataGridViewControl.CellFormatting += HandleCellStyling; } private void RefreshAssemblyResults_Click(object sender, EventArgs e) { - dataGridViewControl.CellFormatting -= HandleCellStyling; - refreshAssemblyResultsButton.Enabled = false; dataGridViewControl.ClearColumns(); InitializeDataGridView();