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

Commit 8b4072d3 authored by Raph Levien's avatar Raph Levien
Browse files

Fix bug 6892600 Font (character pairs) rendering issue 

Alignment on paint for actual glyph drawing needs to always be left,
even when drawing centered or right aligned text. The x offset for
alignment is applied by OpenGLRenderer::drawText (and needs to be early
in the pipeline for quickReject to work). Similar change needed for
drawing drop shadow.

Also fixes bug with mispositioned underline (offset for alignment has
already been applied once, no need to do it again in
drawTextDecorations).

Change-Id: Id3dcd62de5536a26b158d768889273a1492b35d6
parent e72a6e97

libs/hwui/OpenGLRenderer.cpp

+7 −18
Original line number Diff line number Diff line
@@ -2508,13 +2508,14 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count, 
#endif



    bool status;

    if (positions != NULL) {

        status = fontRenderer.renderPosText(paint, clip, text, 0, bytesCount, count, x, y,

    if (paint->getTextAlign() != SkPaint::kLeft_Align) {

        SkPaint paintCopy(*paint);

        paintCopy.setTextAlign(SkPaint::kLeft_Align);

        status = fontRenderer.renderPosText(&paintCopy, clip, text, 0, bytesCount, count, x, y,

            positions, hasActiveLayer ? &bounds : NULL);

    } else {

        // TODO: would it be okay to call renderPosText with null positions?

        status = fontRenderer.renderText(paint, clip, text, 0, bytesCount, count, x, y,

            hasActiveLayer ? &bounds : NULL);

        status = fontRenderer.renderPosText(paint, clip, text, 0, bytesCount, count, x, y,

            positions, hasActiveLayer ? &bounds : NULL);

    }

    if (status) {

#if RENDER_LAYERS_AS_REGIONS
@@ -2801,23 +2802,11 @@ void OpenGLRenderer::drawTextDecorations(const char* text, int bytesCount, float 
            underlineWidth = paintCopy.measureText(text, bytesCount);

        }



        float offsetX = 0;

        switch (paintCopy.getTextAlign()) {

            case SkPaint::kCenter_Align:

                offsetX = underlineWidth * 0.5f;

                break;

            case SkPaint::kRight_Align:

                offsetX = underlineWidth;

                break;

            default:

                break;

        }



        if (CC_LIKELY(underlineWidth > 0.0f)) {

            const float textSize = paintCopy.getTextSize();

            const float strokeWidth = fmax(textSize * kStdUnderline_Thickness, 1.0f);



            const float left = x - offsetX;

            const float left = x;

            float top = 0.0f;



            int linesCount = 0;

libs/hwui/TextDropShadowCache.cpp

+3 −1
Original line number Diff line number Diff line
@@ -107,7 +107,9 @@ ShadowTexture* TextDropShadowCache::get(SkPaint* paint, const char* text, uint32 
    ShadowTexture* texture = mCache.get(entry);



    if (!texture) {

        FontRenderer::DropShadow shadow = mRenderer->renderDropShadow(paint, text, 0,

        SkPaint paintCopy(*paint);

        paintCopy.setTextAlign(SkPaint::kLeft_Align);

        FontRenderer::DropShadow shadow = mRenderer->renderDropShadow(&paintCopy, text, 0,

                len, numGlyphs, radius, positions);



        texture = new ShadowTexture;