Author: jackson
Date: 2006-11-03 11:37:12 -0500 (Fri, 03 Nov 2006)
New Revision: 67315

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
Log:

                - Sorta a revert of the last patch.  For multiline just
                  position
        the controls, then bail.  This way the scrollbar width won't be
        altered.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-11-03 16:34:03 UTC (rev 67314)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-11-03 16:37:12 UTC (rev 67315)
@@ -3,6 +3,9 @@
        * TextBoxBase.cs: Don't bail from the scrollbar calcs for non
        multiline textboxes anymore.  This method also determines the
        width/height of a textboxes canvas area.
+       - Sorta a revert of the last patch.  For multiline just position
+       the controls, then bail.  This way the scrollbar width won't be
+       altered.
 
 2006-11-03  Everaldo Canuto  <[EMAIL PROTECTED]>
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs   
2006-11-03 16:34:03 UTC (rev 67314)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs   
2006-11-03 16:37:12 UTC (rev 67315)
@@ -1585,6 +1585,11 @@
                internal void CalculateScrollBars() {
                        // FIXME - need separate calculations for center and 
right alignment
 
+                       if (!multiline) {
+                               PositionControls ();
+                               return;
+                       }
+
                        if (document.Width >= document.ViewPortWidth) {
                                hscroll.Enabled = true;
                                hscroll.Minimum = 0;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to