Fix tab causing text overflow bug.

Author: Yuncong Zhang

Runtime/ui/txt/layout.cs

@@ -162,18 +162,15 @@ static float _layoutWord(float offset, int layoutOffset,
             float letterSpaceHalfRight = letterSpace - letterSpaceHalfLeft;
 
             for (int i = 0; i < wordCount; i++) {
+                initAdvance = x;
                 var ch = text[start + i];
                 if (i == 0) {
                     x += letterSpaceHalfLeft + wordSpacing;
-                    if (advances != null) {
-                        advances[i + layoutOffset] = letterSpaceHalfLeft + wordSpacing;
-                    }
+                    advances[i + layoutOffset] = letterSpaceHalfLeft + wordSpacing;
                 }
                 else {
-                    if (advances != null) {
-                        advances[i - 1 + layoutOffset] += letterSpaceHalfRight;
-                        advances[i + layoutOffset] = letterSpaceHalfLeft;
-                    }
+                    advances[i - 1 + layoutOffset] += letterSpaceHalfRight;
+                    advances[i + layoutOffset] = letterSpaceHalfLeft;
 
                     x += letterSpace;
                 }
@@ -182,9 +179,7 @@ static float _layoutWord(float offset, int layoutOffset,
                     _updateBounds(glyphInfo, x, ref bounds);
                 }
 
-                if (positions != null) {
-                    positions[i + layoutOffset] = x;
-                }
+                positions[i + layoutOffset] = x;
 
                 float advance;
                 if (ch == '\t') {
@@ -195,15 +190,10 @@ static float _layoutWord(float offset, int layoutOffset,
                 }
 
                 x += advance;
-                if (advances != null) {
-                    advances[i + layoutOffset] += advance;
-                }
+                advances[i + layoutOffset] += advance;
 
                 if (i + 1 == wordCount) {
-                    if (advances != null) {
-                        advances[i + layoutOffset] += letterSpaceHalfRight;
-                    }
-
+                    advances[i + layoutOffset] += letterSpaceHalfRight;
                     x += letterSpaceHalfRight;
                 }
             }
@@ -223,9 +213,7 @@ static float _layoutEmoji(string text, int start, int count, TextStyle style, Fo
                     float letterSpaceHalfRight = letterSpace - letterSpaceHalfLeft;
 
                     x += letterSpaceHalfLeft;
-                    if (advances != null) {
-                        advances[i] = letterSpaceHalfLeft;
-                    }
+                    advances[i] = letterSpaceHalfLeft;
 
 
                     var minX = x;
@@ -234,28 +222,19 @@ static float _layoutEmoji(string text, int start, int count, TextStyle style, Fo
                     var maxY = metrics.descent;
                     _updateBounds(minX, maxX, minY, maxY, ref bounds);
 
-                    if (positions != null) {
-                        positions[i] = x;
-                    }
+                    positions[i] = x;
 
                     float advance = style.fontSize;
                     x += advance;
 
-                    if (advances != null) {
-                        advances[i] += advance;
-                        advances[i] += letterSpaceHalfRight;
-                    }
+                    advances[i] += advance;
+                    advances[i] += letterSpaceHalfRight;
 
                     x += letterSpaceHalfRight;
                 }
                 else {
-                    if (advances != null) {
-                        advances[i] = 0;
-                    }
-
-                    if (positions != null) {
-                        positions[i] = x;
-                    }
+                    advances[i] = 0;
+                    positions[i] = x;
                 }
             }
 

Runtime/ui/txt/paragraph.cs

@@ -801,11 +801,11 @@ public int getLine(TextPosition position) {
 
             var offset = position.offset;
             if (position.affinity == TextAffinity.upstream && offset > 0) {
-                offset = _isUtf16Surrogate(this._text[offset - 1]) ? offset - 2 : offset - 1;
+                offset = char.IsSurrogate(this._text[offset - 1]) ? offset - 2 : offset - 1;
             }
 
             var lineCount = this.getLineCount();
-            for (int lineIndex = 0; lineIndex < this.getLineCount(); ++lineIndex) {
+            for (int lineIndex = 0; lineIndex < lineCount; ++lineIndex) {
                 var line = this._lineRanges[lineIndex];
                 if ((offset >= line.start && offset < line.endIncludingNewLine)) {
                     return lineIndex;
@@ -1090,10 +1090,6 @@ float getLineXOffset(float lineTotalAdvance) {
 
             return 0;
         }
-
-        static bool _isUtf16Surrogate(int value) {
-            return (value & 0xF800) == 0xD800;
-        }
     }
 
     class SplayTree<TKey, TValue> : IDictionary<TKey, TValue> where TKey : IComparable<TKey> {