* TextControl.cs: When combining lines carry over the line end

        style from the end line.

svn path=/trunk/mcs/; revision=67546

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 1ea65a328dc337476f6480e80202e1e74f80b161..1aa76fb5217e52f6eb3b67ab65db2240d6b6ee35 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Jackson Harper  <jackson@ximian.com>
+
+       * TextControl.cs: When combining lines carry over the line end
+       style from the end line.
+
 2006-11-07  Everaldo Canuto  <everaldo@simios.org>
 
        * Toolbar.cs: Release flat button borders when Toolbar lost focus. 

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 44e3eb78fb4273699350a766f4fafed0a82a9f12..c6518d9f1e684f7a4c7569207cb98bd3d177c36b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
@@ -2442,6 +2442,9 @@ if (owner.backcolor_set || (owner.Enabled && !owner.read_only)) {
                        // Combine the two tag chains into one
                        last = first.tags;
 
+                       // Maintain the line ending style
+                       first.soft_break = second.soft_break;
+
                        while (last.next != null) {
                                last = last.next;
                        }