Author: mkestner
Date: 2007-01-02 14:23:25 -0500 (Tue, 02 Jan 2007)
New Revision: 70379

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

2007-01-02  Mike Kestner  <[EMAIL PROTECTED]>

        * ListView.cs: one more try with help from [EMAIL PROTECTED] 
        to fix all hdr height padding codepaths.  Fixes #80207.


Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 19:23:13 UTC (rev 70378)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 19:23:25 UTC (rev 70379)
@@ -1,3 +1,8 @@
+2007-01-02  Mike Kestner  <[EMAIL PROTECTED]>
+
+       * ListView.cs: one more try with help from [EMAIL PROTECTED] 
+       to fix all hdr height padding codepaths.  Fixes #80207.
+
 2007-01-02  Chris Toshok  <[EMAIL PROTECTED]>
 
        * StatusBar.cs (.ctor): remove the Anchor setting, as it's just

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs      
2007-01-02 19:23:13 UTC (rev 70378)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs      
2007-01-02 19:23:25 UTC (rev 70379)
@@ -770,7 +770,6 @@
                        if (col.Width == -2) { // autosize = max(items, 
columnheader)
                                Size size = Size.Ceiling 
(this.DeviceContext.MeasureString
                                                          (col.Text, 
this.Font));
-                               size.Height += text_padding;
                                size.Width += text_padding;
                                ret_size = BiggestItem (index);
                                if (size.Width > ret_size.Width)
@@ -786,11 +785,11 @@
                                                                                
(col.Text, this.Font)).Height;
                                        else
                                                ret_size.Height = 
this.Font.Height;
-
-                                       ret_size.Height += text_padding;
                                }
                        }
 
+                       ret_size.Height += text_padding;
+
                        // adjust the size for icon and checkbox for 0th column
                        if (index == 0) {
                                ret_size.Width += (this.CheckBoxSize.Width + 4);

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

Reply via email to