From dafb63eaf6a8b6047b28448768133ab7e27b8e67 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@novell.com>
Date: Thu, 21 Dec 2006 16:16:00 +0000
Subject: [PATCH] 2006-12-21  Chris Toshok  <toshok@ximian.com>

	* Control.cs: we don't need to be so draconian with
	UpdateDistances, and we thusly don't need to call it before
	calling PerformLayout in ResumeLayout.  Fixes bug #80289.


svn path=/trunk/mcs/; revision=69869
---
 mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog  | 6 ++++++
 mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 56aa0131a66..c908be4daee 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-21  Chris Toshok  <toshok@ximian.com>
+
+	* Control.cs: we don't need to be so draconian with
+	UpdateDistances, and we thusly don't need to call it before
+	calling PerformLayout in ResumeLayout.  Fixes bug #80289.
+
 2006-12-21  Daniel Nauck  <dna@mono-project.de>
 
 	* ComboBox.cs,
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
index 3c08a36d220..3a98043fbe0 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -1484,7 +1484,7 @@ namespace System.Windows.Forms
 		}
 
 		private void UpdateDistances() {
-			if ((parent != null) && (parent.layout_suspended == 0)) {
+			if (parent != null) {
 				dist_left = bounds.X;
 				dist_top = bounds.Y;
 				dist_right = parent.ClientSize.Width - bounds.X - bounds.Width;
@@ -3366,10 +3366,6 @@ namespace System.Windows.Forms
 
 			if (layout_suspended == 0) {
 				Control [] controls = child_controls.GetAllControls ();
-				for (int i=0; i<controls.Length; i++) {
-					controls [i].UpdateDistances ();
-				}
-
 				if (performLayout && layout_pending) {
 					PerformLayout();
 				}
-- 
2.11.4.GIT