Fix editable trailing space problem.

Author: Yuncong Zhang

Runtime/ui/txt/layout.cs

@@ -80,15 +80,17 @@ public static int computeTruncateCount(float offset, string text, int start, int
             return 0;
         }
 
-        public static void computeCharWidths(string text, int start, int count, TextStyle style, float[] advances,
-            int advanceOffset) {
+        public static float computeCharWidths(float offset, string text, int start, int count, TextStyle style,
+            float[] advances, int advanceOffset, TabStops tabStops) {
             char startingChar = text[start];
+            float totalWidths = 0;
             if (char.IsHighSurrogate(startingChar) || EmojiUtils.isSingleCharEmoji(startingChar)) {
                 float advance = style.fontSize + style.letterSpacing;
                 for (int i = 0; i < count; i++) {
                     char ch = text[start + i];
                     if (char.IsHighSurrogate(ch) || EmojiUtils.isSingleCharNonEmptyEmoji(ch)) {
                         advances[i + advanceOffset] = advance;
+                        totalWidths += advance;
                     }
                     else {
                         advances[i + advanceOffset] = 0;
@@ -101,7 +103,10 @@ public static void computeCharWidths(string text, int start, int count, TextStyl
                 font.RequestCharactersInTextureSafe(text, style.UnityFontSize, style.UnityFontStyle);
                 for (int i = 0; i < count; i++) {
                     char ch = text[start + i];
-                    if (font.getGlyphInfo(ch, out var glyphInfo, style.UnityFontSize, style.UnityFontStyle)) {
+                    if (ch == '\t') {
+                        advances[i + advanceOffset] = tabStops.nextTab(offset + totalWidths) - (offset + totalWidths);
+                    }
+                    else if (font.getGlyphInfo(ch, out var glyphInfo, style.UnityFontSize, style.UnityFontStyle)) {
                         advances[i + advanceOffset] = glyphInfo.advance + style.letterSpacing;
                     }
                     else {
@@ -111,8 +116,12 @@ public static void computeCharWidths(string text, int start, int count, TextStyl
                     if (LayoutUtils.isWordSpace(ch)) {
                         advances[i + advanceOffset] += style.wordSpacing;
                     }
+
+                    totalWidths += advances[i + advanceOffset];
                 }
             }
+
+            return totalWidths;
         }
 
         public static float doLayout(float offset, string text, int start, int count, TextStyle style,

Runtime/ui/txt/linebreaker.cs

@@ -174,13 +174,15 @@ public void setLineWidth(float lineWidth) {
             this._lineWidth = lineWidth;
         }
 
-        public void addStyleRun(TextStyle style, int start, int end) {
+        public float addStyleRun(TextStyle style, int start, int end) {
+            float width = 0;
             if (style != null) {
 //                Layout.measureText(this._width - this._preBreak, this._textBuf,
 //                    start, end - start, style,
 //                    this._charWidths, start, this._tabStops);
-                Layout.computeCharWidths(this._textBuf.text, this._textBuf.offset + start, end - start, style,
-                    this._charWidths, start);
+                width = Layout.computeCharWidths(this._width - this._preBreak, this._textBuf.text,
+                    this._textBuf.offset + start, end - start, style,
+                    this._charWidths, start, this._tabStops);
             }
 
             int current = this._wordBreaker.current();
@@ -215,6 +217,8 @@ public void addStyleRun(TextStyle style, int start, int end) {
                     current = this._wordBreaker.next();
                 }
             }
+
+            return width;
         }
 
         public void finish() {

Runtime/ui/txt/paragraph.cs

@@ -580,22 +580,7 @@ void updateLineMetrics(FontMetrics metrics, float styleHeight) {
 
             this._lineCount = lineLimit;
 
-            // Compute max intrinsic width and min intrinsic width
-            // max intrinsic width := maximum width this paragraph could possibly expand, without any constraints,
-            //                        which equals the length of the maximum hard-break line
-            this._maxIntrinsicWidth = 0;
-            float lineBlockWidth = 0;
-            for (int i = 0; i < this._lineWidthCount; ++i) {
-                lineBlockWidth += this._lineWidths[i];
-                if (this._lineRanges[i].hardBreak) {
-                    this._maxIntrinsicWidth = Mathf.Max(lineBlockWidth, this._maxIntrinsicWidth);
-                    lineBlockWidth = 0;
-                }
-            }
-
             // min intrinsic width := minimum width this paragraph has to take, which equals the maximum word width
-            this._maxIntrinsicWidth = Mathf.Max(lineBlockWidth, this._maxIntrinsicWidth);
-
             if (this._paragraphStyle.maxLines == 1 || (this._paragraphStyle.maxLines == null &&
                                                        this._paragraphStyle.ellipsized())) {
                 this._minIntrinsicWidth = this.maxIntrinsicWidth;
@@ -906,6 +891,7 @@ void _resetLineBreaker(LineBreaker lineBreaker, int blockStart, int blockSize, i
 
         int _addStyleRuns(LineBreaker lineBreaker, ref int runIndex, int blockStart, int blockEnd) {
             int countRuns = 0;
+            float lineBlockWidth = 0;
             while (runIndex < this._runs.size) {
                 var run = this._runs.getRun(runIndex);
                 if (run.start >= blockEnd) {
@@ -923,7 +909,8 @@ int _addStyleRuns(LineBreaker lineBreaker, ref int runIndex, int blockStart, int
 
                 int runStart = Mathf.Max(run.start, blockStart) - blockStart;
                 int runEnd = Mathf.Min(run.end, blockEnd) - blockStart;
-                lineBreaker.addStyleRun(run.style, runStart, runEnd);
+                lineBlockWidth += lineBreaker.addStyleRun(run.style, runStart, runEnd);
+
                 countRuns++;
 
                 if (run.end > blockEnd) {
@@ -932,6 +919,7 @@ int _addStyleRuns(LineBreaker lineBreaker, ref int runIndex, int blockStart, int
 
                 runIndex++;
             }
+            this._maxIntrinsicWidth = Mathf.Max(lineBlockWidth, this._maxIntrinsicWidth);
 
             return countRuns;
         }