commit d1f6b6245c546f95a44d0252544ea9e2028a33b4
author Romain Guy <romainguy@google.com> Mon Aug 12 20:52:12 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 12 20:52:13 2013 +0000
tree f468b14767d669ff897de531707d10ba3958b03b
parent 890db42b0d4873bf3a19cd784bb7497db2add22e
parent b15b446f420b3ec69424dabcbcbc8cf019d6c8d6

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

core/jni/android_view_GLES20Canvas.cpp

diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index 70a4daa..6d46cf9 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -610,6 +610,7 @@
     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 @@
     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 @@
     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 @@
     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,