From 528cf5f0bc0f9f15d72df89ffe7d6079dad8bd3e Mon Sep 17 00:00:00 2001 From: paolos Date: Mon, 22 May 2017 16:32:56 +0200 Subject: [PATCH] CalculateLastColumnWidth fix --- Controls/HandleConsumerGroupControl.cs | 2 +- Controls/HandleEventHubControl.cs | 2 +- Controls/HandleNotificationHubControl.cs | 25 ++++++++++++++---------- Controls/HandleQueueControl.cs | 25 ++++++++++++------------ Controls/HandleRelayControl.cs | 2 +- Controls/HandleSubscriptionControl.cs | 22 ++++++++++----------- Controls/HandleTopicControl.cs | 2 +- Controls/ListenerControl.cs | 4 ++-- Controls/PartitionListenerControl.cs | 4 ++-- Controls/TestEventHubControl.cs | 2 +- Controls/TestQueueControl.cs | 2 +- Controls/TestRelayControl.cs | 2 +- Controls/TestTopicControl.cs | 2 +- Forms/EventDataForm.cs | 2 +- Forms/FilterForm.cs | 2 +- Forms/MessageForm.cs | 2 +- 16 files changed, 53 insertions(+), 49 deletions(-) diff --git a/Controls/HandleConsumerGroupControl.cs b/Controls/HandleConsumerGroupControl.cs index 7b1f13be..b34a8fc6 100644 --- a/Controls/HandleConsumerGroupControl.cs +++ b/Controls/HandleConsumerGroupControl.cs @@ -1130,7 +1130,7 @@ private void CalculateLastColumnWidth(object sender) dataGridView.SuspendLayout(); var width = dataGridView.Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/HandleEventHubControl.cs b/Controls/HandleEventHubControl.cs index 4031909d..9d332ae8 100644 --- a/Controls/HandleEventHubControl.cs +++ b/Controls/HandleEventHubControl.cs @@ -1314,7 +1314,7 @@ private void CalculateLastColumnWidth() } var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth; var verticalScrollbar = dataPointDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/HandleNotificationHubControl.cs b/Controls/HandleNotificationHubControl.cs index a49c5f67..8d4ffb4f 100644 --- a/Controls/HandleNotificationHubControl.cs +++ b/Controls/HandleNotificationHubControl.cs @@ -1528,7 +1528,7 @@ private void CalculateLastColumnWidth(object sender) } var width = gridWidth - dataGridView.Columns[0].Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -1536,11 +1536,12 @@ private void CalculateLastColumnWidth(object sender) return; } - if (dataGridView == registrationsDataGridView) + if (dataGridView == registrationsDataGridView && + dataGridView.ColumnCount == 5) { var width = dataGridView.Width - dataGridView.RowHeadersWidth - dataGridView.Columns[0].Width - dataGridView.Columns[3].Width; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -1551,15 +1552,19 @@ private void CalculateLastColumnWidth(object sender) dataGridView.Columns[5].Width = columnWidth + 5; } - if (dataGridView == mpnsTagsDataGridView || - dataGridView == wnsTagsDataGridView || - dataGridView == templateTagsDataGridView || - dataGridView == appleTagsDataGridView || - dataGridView == gcmTagsDataGridView) + if (dataGridView.ColumnCount == 0 || + (dataGridView != mpnsTagsDataGridView && + dataGridView != wnsTagsDataGridView && + dataGridView != templateTagsDataGridView && + dataGridView != appleTagsDataGridView && + dataGridView != gcmTagsDataGridView)) + { + return; + } { var width = dataGridView.Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -4018,7 +4023,7 @@ private void CalculateLastColumnWidth() } var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth; var verticalScrollbar = dataPointDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/HandleQueueControl.cs b/Controls/HandleQueueControl.cs index d67ba4f7..94beee41 100644 --- a/Controls/HandleQueueControl.cs +++ b/Controls/HandleQueueControl.cs @@ -3310,38 +3310,35 @@ private void CalculateLastColumnWidth(object sender) return; } var dataGridView = sender as DataGridView; - if (dataGridView == null) + if (dataGridView == null || dataGridView.ColumnCount == 0) { return; } try { - if (dataGridView.ColumnCount == 0) - { - return; - } dataGridView.SuspendDrawing(); dataGridView.SuspendLayout(); if (dataGridView.Columns.Count == 2) { var width = dataGridView.Width - dataGridView.Columns[0].Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } dataGridView.Columns[1].Width = width; } - if (dataGridView == messagesDataGridView || + if ((dataGridView == messagesDataGridView || dataGridView == deadletterDataGridView || - dataGridView == transferDeadletterDataGridView) + dataGridView == transferDeadletterDataGridView) && + dataGridView.ColumnCount == 6) { var width = dataGridView.Width - dataGridView.RowHeadersWidth - dataGridView.Columns[1].Width - dataGridView.Columns[2].Width; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -3351,11 +3348,15 @@ private void CalculateLastColumnWidth(object sender) dataGridView.Columns[4].Width = columnWidth + (width - (columnWidth*4)) + 10; dataGridView.Columns[5].Width = columnWidth + 10; } - if (dataGridView == sessionsDataGridView) + if (dataGridView != sessionsDataGridView || + dataGridView.ColumnCount != 4) + { + return; + } { var width = dataGridView.Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -3727,7 +3728,7 @@ private void CalculateLastColumnWidth() } var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth; var verticalScrollbar = dataPointDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/HandleRelayControl.cs b/Controls/HandleRelayControl.cs index d54a689f..fe00acb8 100644 --- a/Controls/HandleRelayControl.cs +++ b/Controls/HandleRelayControl.cs @@ -1193,7 +1193,7 @@ private void CalculateLastColumnWidth() } var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth; var verticalScrollbar = dataPointDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/HandleSubscriptionControl.cs b/Controls/HandleSubscriptionControl.cs index 431a1efe..7f2b51d2 100644 --- a/Controls/HandleSubscriptionControl.cs +++ b/Controls/HandleSubscriptionControl.cs @@ -2335,7 +2335,7 @@ private void CalculateLastColumnWidth(object sender) return; } var dataGridView = sender as DataGridView; - if (dataGridView == null) + if (dataGridView == null || dataGridView.Columns.Count == 0) { return; } @@ -2343,29 +2343,26 @@ private void CalculateLastColumnWidth(object sender) { dataGridView.SuspendDrawing(); dataGridView.SuspendLayout(); - if (dataGridView.Columns.Count == 0) - { - return; - } if (dataGridView.Columns.Count == 2) { var width = dataGridView.Width - dataGridView.Columns[0].Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } dataGridView.Columns[1].Width = width; } - if (dataGridView == messagesDataGridView || - dataGridView == deadletterDataGridView) + if ((dataGridView == messagesDataGridView || + dataGridView == deadletterDataGridView) && + dataGridView.ColumnCount == 6) { var width = dataGridView.Width - dataGridView.RowHeadersWidth - dataGridView.Columns[1].Width - dataGridView.Columns[2].Width; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -2375,11 +2372,12 @@ private void CalculateLastColumnWidth(object sender) dataGridView.Columns[4].Width = columnWidth +(width - (columnWidth * 4)) + 10; dataGridView.Columns[5].Width = columnWidth + 10; } - if (dataGridView == sessionsDataGridView) + if (dataGridView == sessionsDataGridView && + dataGridView.ColumnCount == 4) { var width = dataGridView.Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } @@ -2593,7 +2591,7 @@ private void CalculateLastColumnWidth() } var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth; var verticalScrollbar = dataPointDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/HandleTopicControl.cs b/Controls/HandleTopicControl.cs index 79ca0d78..3ce6641b 100644 --- a/Controls/HandleTopicControl.cs +++ b/Controls/HandleTopicControl.cs @@ -1634,7 +1634,7 @@ private void CalculateLastColumnWidth() } var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth; var verticalScrollbar = dataPointDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/ListenerControl.cs b/Controls/ListenerControl.cs index b898f1e1..6f1b51f9 100644 --- a/Controls/ListenerControl.cs +++ b/Controls/ListenerControl.cs @@ -584,7 +584,7 @@ private void CalculateLastColumnWidth(object sender) return; } var dataGridView = sender as DataGridView; - if (dataGridView == null) + if (dataGridView == null || dataGridView.ColumnCount != 3) { return; } @@ -594,7 +594,7 @@ private void CalculateLastColumnWidth(object sender) dataGridView.SuspendLayout(); var width = dataGridView.Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/PartitionListenerControl.cs b/Controls/PartitionListenerControl.cs index 8f0f8975..b6712b8e 100644 --- a/Controls/PartitionListenerControl.cs +++ b/Controls/PartitionListenerControl.cs @@ -606,7 +606,7 @@ private void CalculateLastColumnWidth(object sender) return; } var dataGridView = sender as DataGridView; - if (dataGridView == null) + if (dataGridView == null || dataGridView.ColumnCount != 4) { return; } @@ -616,7 +616,7 @@ private void CalculateLastColumnWidth(object sender) dataGridView.SuspendLayout(); var width = dataGridView.Width - dataGridView.RowHeadersWidth; var verticalScrollbar = dataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/TestEventHubControl.cs b/Controls/TestEventHubControl.cs index 25101b80..1d15b892 100644 --- a/Controls/TestEventHubControl.cs +++ b/Controls/TestEventHubControl.cs @@ -1084,7 +1084,7 @@ private void CalculateLastColumnWidth() var width = propertiesDataGridView.Width - propertiesDataGridView.Columns[0].Width - propertiesDataGridView.Columns[1].Width - propertiesDataGridView.RowHeadersWidth; var verticalScrollbar = propertiesDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/TestQueueControl.cs b/Controls/TestQueueControl.cs index 39482ef6..2265ea12 100644 --- a/Controls/TestQueueControl.cs +++ b/Controls/TestQueueControl.cs @@ -1797,7 +1797,7 @@ private void CalculateLastColumnWidth() var width = propertiesDataGridView.Width - propertiesDataGridView.Columns[0].Width - propertiesDataGridView.Columns[1].Width - propertiesDataGridView.RowHeadersWidth; var verticalScrollbar = propertiesDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/TestRelayControl.cs b/Controls/TestRelayControl.cs index 50d00350..63d8ddbf 100644 --- a/Controls/TestRelayControl.cs +++ b/Controls/TestRelayControl.cs @@ -1209,7 +1209,7 @@ private void CalculateLastColumnWidth() var width = headersDataGridView.Width - headersDataGridView.Columns[0].Width - headersDataGridView.Columns[1].Width - headersDataGridView.RowHeadersWidth; var verticalScrollbar = headersDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Controls/TestTopicControl.cs b/Controls/TestTopicControl.cs index ea081559..1d171e69 100644 --- a/Controls/TestTopicControl.cs +++ b/Controls/TestTopicControl.cs @@ -1791,7 +1791,7 @@ private void CalculateLastColumnWidth() var width = propertiesDataGridView.Width - propertiesDataGridView.Columns[0].Width - propertiesDataGridView.Columns[1].Width - propertiesDataGridView.RowHeadersWidth; var verticalScrollbar = propertiesDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Forms/EventDataForm.cs b/Forms/EventDataForm.cs index 6782315a..1dd20437 100644 --- a/Forms/EventDataForm.cs +++ b/Forms/EventDataForm.cs @@ -210,7 +210,7 @@ private void CalculateLastColumnWidth() var width = propertiesDataGridView.Width - propertiesDataGridView.Columns[0].Width - propertiesDataGridView.Columns[1].Width - propertiesDataGridView.RowHeadersWidth; var verticalScrollbar = propertiesDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Forms/FilterForm.cs b/Forms/FilterForm.cs index 524e4f09..60497798 100644 --- a/Forms/FilterForm.cs +++ b/Forms/FilterForm.cs @@ -325,7 +325,7 @@ private void CalculateLastColumnWidth() var width = timeFilterDataGridView.Width - timeFilterDataGridView.Columns[0].Width - timeFilterDataGridView.Columns[1].Width - timeFilterDataGridView.RowHeadersWidth; var verticalScrollbar = timeFilterDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; } diff --git a/Forms/MessageForm.cs b/Forms/MessageForm.cs index d7360185..b5d01726 100644 --- a/Forms/MessageForm.cs +++ b/Forms/MessageForm.cs @@ -274,7 +274,7 @@ private void CalculateLastColumnWidth() var width = propertiesDataGridView.Width - propertiesDataGridView.Columns[0].Width - propertiesDataGridView.Columns[1].Width - propertiesDataGridView.RowHeadersWidth; var verticalScrollbar = propertiesDataGridView.Controls.OfType().First(); - if (verticalScrollbar.Visible) + if (verticalScrollbar != null && verticalScrollbar.Visible) { width -= verticalScrollbar.Width; }