From 2a475eae622adc1e8fa29206be1eaf862c23548e Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Fri, 28 Apr 2017 15:35:12 -0400 Subject: 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 Reviewed-by: Cary Clark Reviewed-by: Mike Reed Reviewed-by: Cary Clark --- gm/cubicpaths.cpp | 58 +++++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 32 deletions(-) (limited to 'gm/cubicpaths.cpp') 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(); } -- cgit v1.2.3