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/degeneratesegments.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/degeneratesegments.cpp')
| -rw-r--r-- | gm/degeneratesegments.cpp | 64 |
1 files changed, 28 insertions, 36 deletions
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp index 25da045bc4..9de66ea9ea 100644 --- a/gm/degeneratesegments.cpp +++ b/gm/degeneratesegments.cpp @@ -294,10 +294,10 @@ protected: const char title[] = "Random Paths Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, " "with Stroke width 6"; - 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(220*SK_Scalar1, 50*SK_Scalar1); @@ -351,38 +351,30 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(style.fName, - strlen(style.fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(fill.fName, - strlen(fill.fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(cap.fName, - strlen(cap.fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s1], - strlen(gSegmentNames[s1]), - 0, rect.height() + 48 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s2], - strlen(gSegmentNames[s2]), - 0, rect.height() + 60 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s3], - strlen(gSegmentNames[s3]), - 0, rect.height() + 72 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s4], - strlen(gSegmentNames[s4]), - 0, rect.height() + 84 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s5], - strlen(gSegmentNames[s5]), - 0, rect.height() + 96 * SK_Scalar1, - labelPaint); + canvas->drawString(style.fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(fill.fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(cap.fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s1], + 0, rect.height() + 48 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s2], + 0, rect.height() + 60 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s3], + 0, rect.height() + 72 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s4], + 0, rect.height() + 84 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s5], + 0, rect.height() + 96 * SK_Scalar1, + labelPaint); } canvas->restore(); } |