Merge "Fix top/bottom to adjust fallback ascent/descent."

2021-12-13 18:03:00 +00:00
parent 90413535d6 d2980207d2
commit 508f81fc7a
1 changed files with 12 additions and 0 deletions
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -874,6 +874,18 @@ public class StaticLayout extends Layout {
                            ? Math.max(fmDescent, Math.round(descents[breakIndex]))
                            : fmDescent;

+                    // The fallback ascent/descent may be larger than top/bottom of the default font
+                    // metrics. Adjust top/bottom with ascent/descent for avoiding unexpected
+                    // clipping.
+                    if (fallbackLineSpacing) {
+                        if (ascent < fmTop) {
+                            fmTop = ascent;
+                        }
+                        if (descent > fmBottom) {
+                            fmBottom = descent;
+                        }
+                    }
+
                    v = out(source, here, endPos,
                            ascent, descent, fmTop, fmBottom,
                            v, spacingmult, spacingadd, chooseHt, chooseHtv, fm,