Author: jackson
Date: 2006-12-20 11:47:16 -0500 (Wed, 20 Dec 2006)
New Revision: 69815

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

        - PreferredHeight is a little different than i thought.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-12-20 16:32:11 UTC (rev 69814)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-12-20 16:47:16 UTC (rev 69815)
@@ -3,6 +3,7 @@
        * TextBoxBase.cs: When changing the font across the document we
        can't recalculate after changing each line, since that will cahnge
        the line count.
+       - PreferredHeight is a little different than i thought.
 
 2006-12-19  Rolf Bjarne Kvinge  <[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-12-20 16:32:11 UTC (rev 69814)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs   
2006-12-20 16:47:16 UTC (rev 69815)
@@ -460,16 +460,7 @@
                [EditorBrowsable(EditorBrowsableState.Advanced)]
                public int PreferredHeight {
                        get {
-                               int bs = 0;
-                               switch (border_style) {
-                               case BorderStyle.FixedSingle:
-                                       bs = 2;
-                                       break;
-                               case BorderStyle.Fixed3D:
-                                       bs = 
ThemeEngine.Current.Border3DSize.Width * 2;
-                                       break;
-                               }
-                               return this.Font.Height + 7 + bs;
+                               return (BorderStyle == BorderStyle.None ? 0 : 
Font.Height + 7);
                        }
                }
 

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

Reply via email to