@galacean/engine-core 0.0.0-experimental-1.4-small-language.1 → 0.0.0-experimental-1.4-small-language.4

package/dist/main.js

@@ -1562,7 +1562,7 @@ FontAtlas.textureSize = 256;
         // Safari gets data confusion through getImageData when the canvas width is not an integer.
         // The measure text width of some special invisible characters may be 0, so make sure the width is at least 1.
         // @todo: Text layout may vary from standard and not support emoji.
-        var _context_measureText = context.measureText(measureString), actualBoundingBoxLeft = _context_measureText.actualBoundingBoxLeft, actualBoundingBoxRight = _context_measureText.actualBoundingBoxRight, actualWidth = _context_measureText.width;
+        var _context_measureText = context.measureText(measureString), actualBoundingBoxLeft = _context_measureText.actualBoundingBoxLeft, actualBoundingBoxRight = _context_measureText.actualBoundingBoxRight, fontBoundingBoxAscent = _context_measureText.fontBoundingBoxAscent, fontBoundingBoxDescent = _context_measureText.fontBoundingBoxDescent, actualWidth = _context_measureText.width;
         // In some case (ex: " "), actualBoundingBoxRight and actualBoundingBoxLeft will be 0, so use width.
         // TODO: With testing, actualBoundingBoxLeft + actualBoundingBoxRight is the actual rendering width
         // but the space rules between characters are unclear. Using actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft) is the closest to the native effect.
@@ -1571,6 +1571,12 @@ FontAtlas.textureSize = 256;
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
+        if (!this.useImageData) {
+            var as = Math.ceil(fontBoundingBoxAscent);
+            var des = Math.ceil(fontBoundingBoxDescent);
+            height = as + des + 1;
+            baseline = as;
+        }
         var _extendHeight = TextUtils._extendHeight;
         height += _extendHeight;
         baseline += _extendHeight * 0.5;