diff options
author | Carlos Alberto Cortez <calberto.cortez@gmail.com> | 2007-01-10 23:16:55 +0300 |
---|---|---|
committer | Carlos Alberto Cortez <calberto.cortez@gmail.com> | 2007-01-10 23:16:55 +0300 |
commit | 02ac0e4ead739c140ca2e28414b393a5d5b0e5c2 (patch) | |
tree | cbd557cc1832503468012a7e8f2a9a8d8cb6d69e | |
parent | 293df8d1ca5ff17ef587ce6df7e8abfbb9255b5a (diff) |
2007-01-10 Carlos Alberto Cortez <calberto.cortez@gmail.com>
* ListView.cs: Add more text padding space when using
auto resize for columns (the previous value didn't work fine).
* ThemeWin32Classic.cs: Update text position inside columns,
to match the appeareance of .Net.
* ColumnHeader.cs: When using auto resize, only the Width should
depend on the sub items, not the Height. Also, set width after
auto resizing (the value of Width should never remain as -1 or -2).
svn path=/trunk/mcs/; revision=70809
4 files changed, 27 insertions, 13 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 2f5a759a29e..064fe64b4fe 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,15 @@ +2007-01-10 Carlos Alberto Cortez <calberto.cortez@gmail.com> + + * ListView.cs: Add more text padding space when using + auto resize for columns (the previous value didn't work fine). + + * ThemeWin32Classic.cs: Update text position inside columns, + to match the appeareance of .Net. + + * ColumnHeader.cs: When using auto resize, only the Width should + depend on the sub items, not the Height. Also, set width after + auto resizing (the value of Width should never remain as -1 or -2). + 2007-01-10 Chris Toshok <toshok@ximian.com> * Application.cs: fix compilation errors when debug is enabled. diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs index 42d49d8e063..5644f363bc9 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs @@ -145,17 +145,18 @@ namespace System.Windows.Forms // text is wrappable only in LargeIcon and SmallIcon views format.FormatFlags = StringFormatFlags.NoWrap; - if (width >= 0) { - column_rect.Width = width; - if (owner != null) - column_rect.Height = owner.Font.Height + 5 ; - else - column_rect.Height = ThemeEngine.Current.DefaultFont.Height + 5; - } - else if (Index != -1) - column_rect.Size = owner.GetChildColumnSize (Index); + if (owner != null) + column_rect.Height = owner.Font.Height + 8; else - column_rect.Size = Size.Empty; + column_rect.Height = ThemeEngine.Current.DefaultFont.Height + 8; + + if (width >= 0) + column_rect.Width = width; + else if (Index != -1) { + column_rect.Width = owner.GetChildColumnSize (Index).Width; + width = column_rect.Width; + } else + column_rect.Width = 0; } internal void SetListView (ListView list_view) diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs index 60c76b9b705..ab2710054d4 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs @@ -760,7 +760,7 @@ namespace System.Windows.Forms Refresh (); } - const int text_padding = 5; + const int text_padding = 15; internal Size GetChildColumnSize (int index) { diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs index 591ab8ee6f3..463bd7ecf56 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs @@ -1754,10 +1754,11 @@ namespace System.Windows.Forms else state = ButtonState.Flat; this.CPDrawButton (dc, rect, state); - rect.X += 3; - rect.Width -= 8; + rect.X += 8; + rect.Width -= 13; if (rect.Width <= 0) continue; + dc.DrawString (col.Text, DefaultFont, SystemBrushes.ControlText, rect, col.Format); |