Merge branch 'master' of https://github.com/PavelTorgashov/FastColoredTextBox

Storm · Storm · commit 6d5e2b6c486a · 2018-12-05T16:35:53.000+02:00
diff --git a/FastColoredTextBox/FastColoredTextBox.cs b/FastColoredTextBox/FastColoredTextBox.cs
@@ -5067,6 +5067,13 @@ protected override void OnPaint(PaintEventArgs e)
                 for (int iWordWrapLine = 0; iWordWrapLine < lineInfo.WordWrapStringsCount; iWordWrapLine++)
                 {
                     y = lineInfo.startY + iWordWrapLine*CharHeight - VerticalScroll.Value;
+                    // break if too long line (important for extremly big lines)
+                    if (y > VerticalScroll.Value + ClientSize.Height)
+                        break;
+                    // continue if wordWrapLine isn't seen yet (important for extremly big lines)
+                    if (lineInfo.startY + iWordWrapLine * CharHeight < VerticalScroll.Value)
+                        continue;
+
                     //indent
                     var indent = iWordWrapLine == 0 ? 0 : lineInfo.wordWrapIndent * CharWidth;
                     //draw chars
@@ -5836,7 +5843,7 @@ private void SelectWord(Place p)
             Selection = new Range(this, toX, p.iLine, fromX, p.iLine);
         }
 
-        private int YtoLineIndex(int y)
+        public int YtoLineIndex(int y)
         {
             int i = LineInfos.BinarySearch(new LineInfo(-10), new LineYComparer(y));
             i = i < 0 ? -i - 2 : i;
@@ -5875,6 +5882,15 @@ public Place PointToPlace(Point point)
                 iLine = FindPrevVisibleLine(iLine);
             //
             int iWordWrapLine = LineInfos[iLine].WordWrapStringsCount;
+
+            //set iWordWrapLine more accurate (important for extremly big lines)
+            if (y > point.Y)
+            {
+                int approximatelyLines = (y - point.Y - CharHeight) / CharHeight;
+                y -= approximatelyLines * CharHeight;
+                iWordWrapLine -= approximatelyLines;
+            }
+
             do
             {
                 iWordWrapLine--;
