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

Commit 76bf4d6d authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug... 

am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev

* commit 'd1f6b624':
  Take text alignment into account to compue text bounds Bug #10258621
parents 1e68ffc7 d1f6b624

core/jni/android_view_GLES20Canvas.cpp

+4 −4
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ static void renderText(OpenGLRenderer* renderer, const jchar* text, int count, 
    const jchar* glyphs = value->getGlyphs();

    size_t glyphsCount = value->getGlyphsCount();

    jfloat totalAdvance = value->getTotalAdvance();

    x += xOffsetForTextAlign(paint, totalAdvance);

    const float* positions = value->getPos();

    int bytesCount = glyphsCount * sizeof(jchar);

    const SkRect& r = value->getBounds();
@@ -617,8 +618,7 @@ static void renderText(OpenGLRenderer* renderer, const jchar* text, int count, 
    bounds.translate(x, y);



    renderer->drawText((const char*) glyphs, bytesCount, glyphsCount,

            x + xOffsetForTextAlign(paint, totalAdvance), y, positions,

            paint, totalAdvance, bounds);

            x, y, positions, paint, totalAdvance, bounds);

}



static void renderTextOnPath(OpenGLRenderer* renderer, const jchar* text, int count,
@@ -646,6 +646,7 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text, 
    const jchar* glyphs = value->getGlyphs();

    size_t glyphsCount = value->getGlyphsCount();

    jfloat totalAdvance = value->getTotalAdvance();

    x += xOffsetForTextAlign(paint, totalAdvance);

    const float* positions = value->getPos();

    int bytesCount = glyphsCount * sizeof(jchar);

    const SkRect& r = value->getBounds();
@@ -653,8 +654,7 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text, 
    bounds.translate(x, y);



    renderer->drawText((const char*) glyphs, bytesCount, glyphsCount,

            x + xOffsetForTextAlign(paint, totalAdvance), y, positions,

            paint, totalAdvance, bounds);

            x, y, positions, paint, totalAdvance, bounds);

}



static void android_view_GLES20Canvas_drawTextArray(JNIEnv* env, jobject clazz,