diff options
author | Ben Wagner <bungeman@google.com> | 2018-02-15 10:20:04 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-22 20:55:05 +0000 |
commit | c912d6133c66df7cde3d64adc76941856a12da64 (patch) | |
tree | d930e2c70814d21347d5069089fa6f18c25ddcb8 /gm/fontmgr.cpp | |
parent | 0f66681ff1c7a2b22d89424ba69e3a5bb8c40b0b (diff) |
Add color fonts.
BUG=skia:7624
Change-Id: Id2b7449048591892ff802484d5e3745a7e1402bb
Reviewed-on: https://skia-review.googlesource.com/109521
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'gm/fontmgr.cpp')
-rw-r--r-- | gm/fontmgr.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index a0b2f5b44a..58c569c300 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -9,6 +9,7 @@ #include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkFontMgr.h" +#include "SkPath.h" #include "SkGraphics.h" #include "SkTypeface.h" @@ -224,6 +225,7 @@ public: fontBounds.offset(x, y); SkPaint boundsPaint(glyphPaint); boundsPaint.setColor(boundsColor); + boundsPaint.setStyle(SkPaint::kStroke_Style); canvas->drawRect(fontBounds, boundsPaint); SkPaint::FontMetrics fm; @@ -264,6 +266,10 @@ public: } SkGlyphID str[] = { left, right, top, bottom }; for (size_t i = 0; i < SK_ARRAY_COUNT(str); ++i) { + SkPath path; + glyphPaint.getTextPath(&str[i], sizeof(str[0]), x, y, &path); + SkPaint::Style style = path.isEmpty() ? SkPaint::kFill_Style : SkPaint::kStroke_Style; + glyphPaint.setStyle(style); canvas->drawText(&str[i], sizeof(str[0]), x, y, glyphPaint); } } @@ -282,7 +288,6 @@ protected: paint.setAntiAlias(true); paint.setSubpixelText(true); paint.setTextSize(100); - paint.setStyle(SkPaint::kStroke_Style); paint.setTextScaleX(fScaleX); paint.setTextSkewX(fSkewX); |