drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support fake italics

Browse Source 
This patch adds fake italics, using essentially the same mechanism as
the fake bold implementation. Also combines fake bold/italic settings
with ones explicitly set in the paint.

Change-Id: Ia7eb3ddc8a6192d191711ba723ffd0d1d9d93f2e
This commit is contained in:
Raph Levien
2014-06-06 22:31:15 -07:00
parent 1fc0fa87d4
commit 0627ec08dc
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android/graphics/MinikinSkia.cpp
View File

@ -118,8 +118,10 @@ void MinikinFontSkia::unpackPaintFlags(SkPaint* paint, uint32_t paintFlags) {
void MinikinFontSkia::populateSkPaint(SkPaint* paint, const MinikinFont* font, FontFakery fakery) {
paint->setTypeface(reinterpret_cast<const MinikinFontSkia*>(font)->GetSkTypeface());
paint->setFakeBoldText(fakery.isFakeBold());
// TODO: fake italics
paint->setFakeBoldText(paint->isFakeBoldText() || fakery.isFakeBold());
if (fakery.isFakeItalic()) {
paint->setTextSkewX(paint->getTextSkewX() - 0.25f);
}
}
}

6
core/jni/android/graphics/MinikinUtils.h
View File

@ -39,6 +39,8 @@ public:
// f is a functor of type void f(size_t start, size_t end);
template <typename F>
static void forFontRun(const Layout& layout, SkPaint* paint, F& f) {
float saveSkewX = paint->getTextSkewX();
bool savefakeBold = paint->isFakeBoldText();
MinikinFont* curFont = NULL;
size_t start = 0;
size_t nGlyphs = layout.nGlyphs();
@ -47,6 +49,8 @@ public:
if (i > 0 && nextFont != curFont) {
MinikinFontSkia::populateSkPaint(paint, curFont, layout.getFakery(start));
f(start, i);
paint->setTextSkewX(saveSkewX);
paint->setFakeBoldText(savefakeBold);
start = i;
}
curFont = nextFont;
@ -54,6 +58,8 @@ public:
if (nGlyphs > start) {
MinikinFontSkia::populateSkPaint(paint, curFont, layout.getFakery(start));
f(start, nGlyphs);
paint->setTextSkewX(saveSkewX);
paint->setFakeBoldText(savefakeBold);
}
}
};

9
core/jni/android/graphics/Paint.cpp
View File

@ -440,9 +440,18 @@ public:
TypefaceImpl* typeface = GraphicsJNI::getNativeTypeface(env, jpaint);
typeface = TypefaceImpl_resolveDefault(typeface);
FakedFont baseFont = typeface->fFontCollection->baseFontFaked(typeface->fStyle);
float saveSkewX = paint->getTextSkewX();
bool savefakeBold = paint->isFakeBoldText();
MinikinFontSkia::populateSkPaint(paint, baseFont.font, baseFont.fakery);
#endif
SkScalar spacing = paint->getFontMetrics(metrics);
#ifdef USE_MINIKIN
// The populateSkPaint call may have changed fake bold / text skew
// because we want to measure with those effects applied, so now
// restore the original settings.
paint->setTextSkewX(saveSkewX);
paint->setFakeBoldText(savefakeBold);
#endif
SkPaintOptionsAndroid paintOpts = paint->getPaintOptionsAndroid();
if (paintOpts.getFontVariant() == SkPaintOptionsAndroid::kElegant_Variant) {
SkScalar size = paint->getTextSize();