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

am f6834478: Always render text underline extra. Bug #3381287

Browse Source 
* commit 'f6834478b379856d3e5de92ddce7de0e6ba9fa4a':
  Always render text underline extra. Bug #3381287
This commit is contained in:
Romain Guy
2011-01-23 13:32:12 -08:00
committed by Android Git Automerger
parent 11a5d42454 f6834478b3
commit 73fafb382b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/hwui/OpenGLRenderer.cpp
View File

@@ -1706,12 +1706,17 @@ void OpenGLRenderer::drawTextDecorations(const char* text, int bytesCount, float
if (underlineWidth > 0.0f) {
const float textSize = paint->getTextSize();
const float strokeWidth = textSize * kStdUnderline_Thickness;
// TODO: Support stroke width < 1.0f when we have AA lines
const float strokeWidth = fmax(textSize * kStdUnderline_Thickness, 1.0f);
const float left = x - offsetX;
float top = 0.0f;
const int pointsCount = 4 * (flags & SkPaint::kStrikeThruText_Flag ? 2 : 1);
int linesCount = 0;
if (flags & SkPaint::kUnderlineText_Flag) linesCount++;
if (flags & SkPaint::kStrikeThruText_Flag) linesCount++;
const int pointsCount = 4 * linesCount;
float points[pointsCount];
int currentPoint = 0;

2
libs/hwui/TextureCache.cpp
View File

@@ -60,7 +60,7 @@ void TextureCache::init() {
mCache.setOnEntryRemovedListener(this);
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
LOGD(" Maximum texture dimension is %d pixels", mMaxTextureSize);
INIT_LOGD(" Maximum texture dimension is %d pixels", mMaxTextureSize);
mDebugEnabled = readDebugLevel() & kDebugCaches;
}