diff options
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 25 | ||||
| -rw-r--r-- | libs/hwui/TextDropShadowCache.cpp | 4 |
2 files changed, 10 insertions, 19 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index d0d5af5..a1da878 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -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; diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp index 93aa8a5..8426f58 100644 --- a/libs/hwui/TextDropShadowCache.cpp +++ b/libs/hwui/TextDropShadowCache.cpp @@ -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; |