Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd1f6b6245c546f95a44d0252544ea9e2028a33b4':
  Take text alignment into account to compue text bounds Bug #10258621
This commit is contained in:
Romain Guy
2013-08-12 14:26:56 -07:00
committed by Android Git Automerger
parent 1e68ffc72f d1f6b6245c
commit 76bf4d6dbe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_view_GLES20Canvas.cpp
View File

@@ -610,6 +610,7 @@ static void renderText(OpenGLRenderer* renderer, const jchar* text, int count,
const jchar* glyphs = value->getGlyphs(); const jchar* glyphs = value->getGlyphs();
size_t glyphsCount = value->getGlyphsCount(); size_t glyphsCount = value->getGlyphsCount();
jfloat totalAdvance = value->getTotalAdvance(); jfloat totalAdvance = value->getTotalAdvance();
x += xOffsetForTextAlign(paint, totalAdvance);
const float* positions = value->getPos(); const float* positions = value->getPos();
int bytesCount = glyphsCount * sizeof(jchar); int bytesCount = glyphsCount * sizeof(jchar);
const SkRect& r = value->getBounds(); const SkRect& r = value->getBounds();
@@ -617,8 +618,7 @@ static void renderText(OpenGLRenderer* renderer, const jchar* text, int count,
bounds.translate(x, y); bounds.translate(x, y);
renderer->drawText((const char*) glyphs, bytesCount, glyphsCount, renderer->drawText((const char*) glyphs, bytesCount, glyphsCount,
x + xOffsetForTextAlign(paint, totalAdvance), y, positions, x, y, positions, paint, totalAdvance, bounds);
paint, totalAdvance, bounds);
} }
static void renderTextOnPath(OpenGLRenderer* renderer, const jchar* text, int count, 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(); const jchar* glyphs = value->getGlyphs();
size_t glyphsCount = value->getGlyphsCount(); size_t glyphsCount = value->getGlyphsCount();
jfloat totalAdvance = value->getTotalAdvance(); jfloat totalAdvance = value->getTotalAdvance();
x += xOffsetForTextAlign(paint, totalAdvance);
const float* positions = value->getPos(); const float* positions = value->getPos();
int bytesCount = glyphsCount * sizeof(jchar); int bytesCount = glyphsCount * sizeof(jchar);
const SkRect& r = value->getBounds(); const SkRect& r = value->getBounds();
@@ -653,8 +654,7 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text,
bounds.translate(x, y); bounds.translate(x, y);
renderer->drawText((const char*) glyphs, bytesCount, glyphsCount, renderer->drawText((const char*) glyphs, bytesCount, glyphsCount,
x + xOffsetForTextAlign(paint, totalAdvance), y, positions, x, y, positions, paint, totalAdvance, bounds);
paint, totalAdvance, bounds);
} }
static void android_view_GLES20Canvas_drawTextArray(JNIEnv* env, jobject clazz, static void android_view_GLES20Canvas_drawTextArray(JNIEnv* env, jobject clazz,