Author: jpobst
Date: 2007-10-15 12:55:47 -0400 (Mon, 15 Oct 2007)
New Revision: 87524
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayout.cs
Log:
2007-10-15 Jonathan Pobst <[EMAIL PROTECTED]>
* TableLayout.cs: If a control has an explicitly set col/row greater
than the number of columns/rows in the panel, expand the table to
accommodate the control. [Fixes bug #332892]
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/ChangeLog
2007-10-15 16:47:58 UTC (rev 87523)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/ChangeLog
2007-10-15 16:55:47 UTC (rev 87524)
@@ -1,3 +1,9 @@
+2007-10-15 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * TableLayout.cs: If a control has an explicitly set col/row greater
+ than the number of columns/rows in the panel, expand the table to
+ accommodate the control. [Fixes bug #332892]
+
2007-10-11 Jonathan Pobst <[EMAIL PROTECTED]>
* TableLayout.cs: When calculating the size of AutoSize row/columns,
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayout.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayout.cs
2007-10-15 16:47:58 UTC (rev 87523)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayout.cs
2007-10-15 16:55:47 UTC (rev 87524)
@@ -118,7 +118,10 @@
for (int i = 1; i < row_span;
i++)
grid[col, row + i] =
dummy_control;
}
- }
+ // We have a control that has an explicitly set
col/row greater than
+ // the number or columns/rows in the table, so
expand to accommodate it
+ } else if (col >= columns || row >= rows)
+ return CalculateControlPositions
(panel, Math.Max (columns, col + 1), Math.Max (rows, row + 1));
}
int x_pointer = 0;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
