diff options
| author | Romain Guy <romainguy@google.com> | 2011-08-30 14:41:48 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2011-08-30 14:41:48 -0700 |
| commit | 799833a8b451a04be201d25ae72213e8562f7774 (patch) | |
| tree | e500503c24c747cda8884987cd8a0ae28ff0e666 /libs | |
| parent | 94d5e9ad6533864f098b99c231d69c77230a828f (diff) | |
| download | frameworks_base-799833a8b451a04be201d25ae72213e8562f7774.zip frameworks_base-799833a8b451a04be201d25ae72213e8562f7774.tar.gz frameworks_base-799833a8b451a04be201d25ae72213e8562f7774.tar.bz2 | |
Text would disappear when the font size is 75px.
Bug #5230196
Yes, 75px. Any other font size would work. Don't ask.
Change-Id: I96c7db9926a97f65128d60c8238c3640ee2444ba
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 9acf99b..dd05e61 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -394,14 +394,14 @@ void FontRenderer::flushAllAndInvalidate() { bool FontRenderer::cacheBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY) { // If the glyph is too tall, don't cache it - if (glyph.fHeight > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) { + if (glyph.fHeight + 2 > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) { if (mCacheHeight < MAX_TEXT_CACHE_HEIGHT) { // Default cache not large enough for large glyphs - resize cache to // max size and try again flushAllAndInvalidate(); initTextTexture(true); } - if (glyph.fHeight > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) { + if (glyph.fHeight + 2 > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) { LOGE("Font size to large to fit in cache. width, height = %i, %i", (int) glyph.fWidth, (int) glyph.fHeight); return false; |