diff options
author | Cary Clark <caryclark@google.com> | 2017-04-28 15:35:12 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-28 20:41:04 +0000 |
commit | 2a475eae622adc1e8fa29206be1eaf862c23548e (patch) | |
tree | 6bad5dbe2ef7aad1c7e657df6bd8cfe3a752c5fd /gm/coloremoji.cpp | |
parent | ec138b40ba940ab0d76b5550ee2c5505629c5293 (diff) |
add drawString helper to canvas
Many tests and examples use drawText with
a guess of how long the text is in bytes,
or a call to strlen(). Add a helper to
SkCanvas to simplify these examples.
Add another helper for SkString.
R=reed@google.com
Change-Id: I0204a31e938f065606f08ee7cd9a6b36db791ee2
Reviewed-on: https://skia-review.googlesource.com/13642
Commit-Queue: Cary Clark <caryclark@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'gm/coloremoji.cpp')
-rw-r--r-- | gm/coloremoji.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index f871e53d55..7626f9a071 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -88,7 +88,7 @@ protected: paint.setTextSize(textSize); paint.getFontMetrics(&metrics); y += -metrics.fAscent; - canvas->drawText(text, strlen(text), 10, y, paint); + canvas->drawString(text, 10, y, paint); y += metrics.fDescent + metrics.fLeading; } @@ -124,7 +124,7 @@ protected: shaderPaint.setTextSize(30); shaderPaint.getFontMetrics(&metrics); y += -metrics.fAscent; - canvas->drawText(text, strlen(text), 380, y, shaderPaint); + canvas->drawString(text, 380, y, shaderPaint); y += metrics.fDescent + metrics.fLeading; } } @@ -162,10 +162,10 @@ protected: canvas->save(); canvas->drawRect(clipRect, clipHairline); paint.setAlpha(0x20); - canvas->drawText(text, strlen(text), 0, 0, paint); + canvas->drawString(text, 0, 0, paint); canvas->clipRect(clipRect); paint.setAlpha(0xFF); - canvas->drawText(text, strlen(text), 0, 0, paint); + canvas->drawString(text, 0, 0, paint); canvas->restore(); canvas->translate(0, SkIntToScalar(25)); } |