Author: calberto
Date: 2007-01-15 20:31:57 -0500 (Mon, 15 Jan 2007)
New Revision: 71101

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
2007-01-15 Carlos Alberto Cortez <[EMAIL PROTECTED]>

        * ListViewItem.cs:
        * ThemeWin32Classic.cs: Don't draw the item text outside
        item bounds in Details view, as well as use trimming.
        Fixes bug #80376.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-16 01:14:31 UTC (rev 71100)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-16 01:31:57 UTC (rev 71101)
@@ -1,3 +1,10 @@
+2007-01-15 Carlos Alberto Cortez <[EMAIL PROTECTED]>
+
+       * ListViewItem.cs:
+       * ThemeWin32Classic.cs: Don't draw the item text outside
+       item bounds in Details view, as well as use trimming.
+       Fixes bug #80376.
+
 2007-01-15  Jonathan Pobst  <[EMAIL PROTECTED]>
 
        * Form.cs: Implement Form.ShowIcon.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs  
2007-01-16 01:14:31 UTC (rev 71100)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs  
2007-01-16 01:31:57 UTC (rev 71101)
@@ -705,7 +705,7 @@
                                label_rect.X = icon_rect.Right + 1;
 
                                if (owner.Columns.Count > 0)
-                                       label_rect.Width = Math.Max 
(text_size.Width, owner.Columns[0].Wd);
+                                       label_rect.Width = owner.Columns [0].Wd 
- label_rect.X;
                                else
                                        label_rect.Width = text_size.Width;
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2007-01-16 01:14:31 UTC (rev 71100)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2007-01-16 01:31:57 UTC (rev 71101)
@@ -1897,11 +1897,16 @@
                                format.FormatFlags = 
StringFormatFlags.LineLimit;
                        else
                                format.FormatFlags = StringFormatFlags.NoWrap;
-                       
+
                        Rectangle highlight_rect = text_rect;
-                       if (control.View == View.Details && 
!control.FullRowSelect) {
+                       if (control.View == View.Details) { // Adjustments for 
Details view
                                Size text_size = Size.Ceiling (dc.MeasureString 
(item.Text, item.Font));
-                               highlight_rect.Width = text_size.Width + 4;
+
+                               if (!control.FullRowSelect) // Selection 
shouldn't be outside the item bounds
+                                       highlight_rect.Width = Math.Min 
(text_size.Width + 4, text_rect.Width);
+
+                               if (text_size.Width > text_rect.Width)
+                                       format.Trimming = 
StringTrimming.EllipsisCharacter;
                        }
 
                        if (item.Selected && control.Focused)
@@ -1981,6 +1986,12 @@
                                                        sub_item_font = 
subItem.Font;
                                                }
 
+                                               int sub_item_text_width = (int) 
Math.Ceiling (control.DeviceContext.MeasureString (subItem.Text,
+                                                               
sub_item_font).Width);
+
+                                               format.Trimming = 
sub_item_text_width > sub_item_text_rect.Width ? 
StringTrimming.EllipsisCharacter :
+                                                       StringTrimming.None;
+
                                                if (item.Selected && 
(control.Focused || !control.HideSelection) && control.FullRowSelect) {
                                                        Brush bg, text;
                                                        if (control.Focused) {

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

Reply via email to