Skip to content

Commit

Permalink
CalculateLastColumnWidth fix
Browse files Browse the repository at this point in the history
  • Loading branch information
paolos authored and paolos committed May 22, 2017
1 parent f267355 commit 528cf5f
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 49 deletions.
2 changes: 1 addition & 1 deletion Controls/HandleConsumerGroupControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ private void CalculateLastColumnWidth(object sender)
dataGridView.SuspendLayout();
var width = dataGridView.Width - dataGridView.RowHeadersWidth;
var verticalScrollbar = dataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/HandleEventHubControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ private void CalculateLastColumnWidth()
}
var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth;
var verticalScrollbar = dataPointDataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
25 changes: 15 additions & 10 deletions Controls/HandleNotificationHubControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1528,19 +1528,20 @@ private void CalculateLastColumnWidth(object sender)
}
var width = gridWidth - dataGridView.Columns[0].Width - dataGridView.RowHeadersWidth;
var verticalScrollbar = dataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
dataGridView.Columns[1].Width = width;
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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand All @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down Expand Up @@ -4018,7 +4023,7 @@ private void CalculateLastColumnWidth()
}
var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth;
var verticalScrollbar = dataPointDataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
25 changes: 13 additions & 12 deletions Controls/HandleQueueControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand All @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down Expand Up @@ -3727,7 +3728,7 @@ private void CalculateLastColumnWidth()
}
var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth;
var verticalScrollbar = dataPointDataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/HandleRelayControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ private void CalculateLastColumnWidth()
}
var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth;
var verticalScrollbar = dataPointDataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
22 changes: 10 additions & 12 deletions Controls/HandleSubscriptionControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2335,37 +2335,34 @@ private void CalculateLastColumnWidth(object sender)
return;
}
var dataGridView = sender as DataGridView;
if (dataGridView == null)
if (dataGridView == null || dataGridView.Columns.Count == 0)
{
return;
}
try
{
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<VScrollBar>().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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand All @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down Expand Up @@ -2593,7 +2591,7 @@ private void CalculateLastColumnWidth()
}
var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth;
var verticalScrollbar = dataPointDataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/HandleTopicControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 +1634,7 @@ private void CalculateLastColumnWidth()
}
var width = dataPointDataGridView.Width - dataPointDataGridView.RowHeadersWidth - otherColumnsWidth;
var verticalScrollbar = dataPointDataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
4 changes: 2 additions & 2 deletions Controls/ListenerControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -594,7 +594,7 @@ private void CalculateLastColumnWidth(object sender)
dataGridView.SuspendLayout();
var width = dataGridView.Width - dataGridView.RowHeadersWidth;
var verticalScrollbar = dataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
4 changes: 2 additions & 2 deletions Controls/PartitionListenerControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -616,7 +616,7 @@ private void CalculateLastColumnWidth(object sender)
dataGridView.SuspendLayout();
var width = dataGridView.Width - dataGridView.RowHeadersWidth;
var verticalScrollbar = dataGridView.Controls.OfType<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/TestEventHubControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/TestQueueControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/TestRelayControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Controls/TestTopicControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Forms/EventDataForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Forms/FilterForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down
2 changes: 1 addition & 1 deletion Forms/MessageForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<VScrollBar>().First();
if (verticalScrollbar.Visible)
if (verticalScrollbar != null && verticalScrollbar.Visible)
{
width -= verticalScrollbar.Width;
}
Expand Down

0 comments on commit 528cf5f

Please sign in to comment.