Fix text layout after overflow lines

Author: govert

Source/ExcelDna.IntelliSense/ToolTipForm.cs

@@ -315,7 +315,6 @@ protected override void OnPaint(PaintEventArgs e)
         {
             base.OnPaint(e);
 
-            List<int> lineWidths = new List<int>();
             const int maxWidth = 1000;  // Should depend on screen width?
             const int maxHeight = 500;
             const int leftPadding = 6;
@@ -333,6 +332,7 @@ protected override void OnPaint(PaintEventArgs e)
                                   TextFormatFlags.SingleLine | 
                                   TextFormatFlags.ExternalLeading;
 
+            List<int> lineWidths = new List<int>();
             int currentHeight = 0; // Measured from layoutTop, going down
             foreach (var line in _text)
             {
@@ -359,7 +359,6 @@ protected override void OnPaint(PaintEventArgs e)
                     {
                         if (text == "") continue;
 
-                        // How wide is this part?
                         var proposedSize = new Size(maxWidth - lineWidth, maxHeight - currentHeight);
                         var textSize = TextRenderer.MeasureText(e.Graphics, text, font, proposedSize, textFormatFlags);
                         if (textSize.Width <= proposedSize.Width)
@@ -378,10 +377,10 @@ protected override void OnPaint(PaintEventArgs e)
                                 currentHeight += linePadding;
 
                                 lineHeight = minLineHeight;
-                                lineWidth = 2;  // Little bit of indent on these lines
+                                lineWidth = 2;  // Start with a little bit of indent on these lines
                             }
-                            TextRenderer.DrawText(e.Graphics, text, font, new Rectangle(layoutLeft + lineWidth, layoutTop + currentHeight, maxWidth, maxHeight - currentHeight), color, textFormatFlags |= TextFormatFlags.EndEllipsis);
-                            lineWidth += Math.Min(textSize.Width, maxWidth); // + 1;
+                            TextRenderer.DrawText(e.Graphics, text, font, new Rectangle(layoutLeft + lineWidth, layoutTop + currentHeight, maxWidth, maxHeight - currentHeight), color, textFormatFlags | TextFormatFlags.EndEllipsis);
+                            lineWidth += textSize.Width;
                         }
 
                         if (run.IsLink)