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/cubicpaths.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/cubicpaths.cpp')
-rw-r--r-- | gm/cubicpaths.cpp | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index fd2156c1d7..6bbcd9012b 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -202,10 +202,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Cubic Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -244,18 +244,15 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } @@ -347,10 +344,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Cubic Closed Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -389,18 +386,15 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } |