Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7137209 authored by Raph Levien's avatar Raph Levien
Browse files

Fix getFontMetrics problems 

Fixes a number of individual problems. In Minikin builds, gets base font
from TypefaceImpl rather than using whatever random font was in the
paint. Respects elegant metrics in ascent and descent methods as well as
getFontMetrics. Sets fixed ascent and descent values to 1900, -500,
which matches the Roboto font.

Part of the fix for bug 15467288 "Inconsistent line heights on
Minikin builds"

Change-Id: I12915f4a62de28932469c7279241eecf7320c47b
parent 486ed088

core/jni/android/graphics/Paint.cpp

+26 −19
Original line number Diff line number Diff line
@@ -429,26 +429,19 @@ public: 
        GraphicsJNI::getNativePaint(env, paint)->setTextSkewX(skewX);

    }



    static jfloat ascent(JNIEnv* env, jobject paint) {

        NPE_CHECK_RETURN_ZERO(env, paint);

        SkPaint::FontMetrics    metrics;

        (void)GraphicsJNI::getNativePaint(env, paint)->getFontMetrics(&metrics);

        return SkScalarToFloat(metrics.fAscent);

    }



    static jfloat descent(JNIEnv* env, jobject paint) {

        NPE_CHECK_RETURN_ZERO(env, paint);

        SkPaint::FontMetrics    metrics;

        (void)GraphicsJNI::getNativePaint(env, paint)->getFontMetrics(&metrics);

        return SkScalarToFloat(metrics.fDescent);

    }



    static SkScalar getMetricsInternal(SkPaint *paint, SkPaint::FontMetrics *metrics) {

    static SkScalar getMetricsInternal(JNIEnv* env, jobject jpaint, SkPaint::FontMetrics *metrics) {

        const int kElegantTop = 2500;

        const int kElegantBottom = -1000;

        const int kElegantAscent = 1946;

        const int kElegantDescent = -512;

        const int kElegantAscent = 1900;

        const int kElegantDescent = -500;

        const int kElegantLeading = 0;

        SkPaint* paint = GraphicsJNI::getNativePaint(env, jpaint);

#ifdef USE_MINIKIN

        TypefaceImpl* typeface = GraphicsJNI::getNativeTypeface(env, jpaint);

        typeface = TypefaceImpl_resolveDefault(typeface);

        MinikinFont* baseFont = typeface->fFontCollection->baseFont(typeface->fStyle);

        paint->setTypeface(reinterpret_cast<MinikinFontSkia*>(baseFont)->GetSkTypeface());

#endif

        SkScalar spacing = paint->getFontMetrics(metrics);

        SkPaintOptionsAndroid paintOpts = paint->getPaintOptionsAndroid();

        if (paintOpts.getFontVariant() == SkPaintOptionsAndroid::kElegant_Variant) {
@@ -463,10 +456,24 @@ public: 
        return spacing;

    }



    static jfloat ascent(JNIEnv* env, jobject paint) {

        NPE_CHECK_RETURN_ZERO(env, paint);

        SkPaint::FontMetrics metrics;

        getMetricsInternal(env, paint, &metrics);

        return SkScalarToFloat(metrics.fAscent);

    }



    static jfloat descent(JNIEnv* env, jobject paint) {

        NPE_CHECK_RETURN_ZERO(env, paint);

        SkPaint::FontMetrics metrics;

        getMetricsInternal(env, paint, &metrics);

        return SkScalarToFloat(metrics.fDescent);

    }



    static jfloat getFontMetrics(JNIEnv* env, jobject paint, jobject metricsObj) {

        NPE_CHECK_RETURN_ZERO(env, paint);

        SkPaint::FontMetrics metrics;

        SkScalar spacing = getMetricsInternal(GraphicsJNI::getNativePaint(env, paint), &metrics);

        SkScalar spacing = getMetricsInternal(env, paint, &metrics);



        if (metricsObj) {

            SkASSERT(env->IsInstanceOf(metricsObj, gFontMetrics_class));
@@ -483,7 +490,7 @@ public: 
        NPE_CHECK_RETURN_ZERO(env, paint);

        SkPaint::FontMetrics metrics;



        getMetricsInternal(GraphicsJNI::getNativePaint(env, paint), &metrics);

        getMetricsInternal(env, paint, &metrics);

        int ascent = SkScalarRoundToInt(metrics.fAscent);

        int descent = SkScalarRoundToInt(metrics.fDescent);

        int leading = SkScalarRoundToInt(metrics.fLeading);