diff options
| author | Peter Dennis Bartok <pbartok@mono-cvs.ximian.com> | 2006-02-27 06:41:47 +0300 |
|---|---|---|
| committer | Peter Dennis Bartok <pbartok@mono-cvs.ximian.com> | 2006-02-27 06:41:47 +0300 |
| commit | f3c8041493b2d2d3ac20ecd32e4fa693732a286c (patch) | |
| tree | 602fdcde26f420bf951b78a92b6c1f8277f4beef /mcs | |
| parent | da39ca5f6c4cee5624e7aa0ee98f46ec60dea950 (diff) | |
2006-02-26 Peter Dennis Bartok <pbartok@novell.com>
* TextControl.cs(Insert): Combine the last lines unless the insertion
string ends with \n\n, otherwise we leave one line too many (Fixes
something I noticed with the testapp for #77526; the bug itself was
already fixed in the previous checkin)
svn path=/trunk/mcs/; revision=57323
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 7 | ||||
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 45e8122e17e..fb85ce087bc 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,10 @@ +2006-02-26 Peter Dennis Bartok <pbartok@novell.com> + + * TextControl.cs(Insert): Combine the last lines unless the insertion + string ends with \n\n, otherwise we leave one line too many (Fixes + something I noticed with the testapp for #77526; the bug itself was + already fixed in the previous checkin) + 2006-02-26 Peter Dennis Bartok <pbartok@novell.com> * RichTextBox.cs: diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs index 1d0dbf49381..69a447c6144 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs @@ -1889,7 +1889,7 @@ namespace System.Windows.Forms { for (i = 1; i < insert_lines; i++) { Add(base_line + i, ins[i], line.alignment, tag.font, tag.color); } - if (!s.EndsWith("\n")) { + if (!s.EndsWith("\n\n")) { this.Combine(base_line + insert_lines - 1, base_line + insert_lines); } } |