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 /samplecode | |
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 'samplecode')
31 files changed, 61 insertions, 61 deletions
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 2721a5bd18..959ac5094c 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -235,7 +235,7 @@ protected: paint.setTypeface(fFace); apply_shader(&paint, SkScalarToFloat(fInterp)); - canvas->drawText(str.c_str(), str.size(), x, y, paint); + canvas->drawString(str, x, y, paint); // drawdots(canvas, paint); diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp index 62e8c2aa19..cb56783a8b 100644 --- a/samplecode/OverView.cpp +++ b/samplecode/OverView.cpp @@ -167,7 +167,7 @@ void OverView::onDraw(SkCanvas* canvas) { for (int i = 0; i < fCount; ++i) { if (draw_this_name(fNames[i], fMatchStr)) { canvas->drawRect(this->bounds(loc), paint); - canvas->drawText(fNames[i].c_str(), fNames[i].size(), loc.x(), loc.y(), fNamePaint); + canvas->drawString(fNames[i], loc.x(), loc.y(), fNamePaint); this->next(&loc); } } diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp index 875db26ca2..6f6541b0d9 100644 --- a/samplecode/SampleAAGeometry.cpp +++ b/samplecode/SampleAAGeometry.cpp @@ -606,8 +606,8 @@ struct UniControl { canvas->drawLine(fBounds.fLeft - 5, fYLo, fBounds.fRight + 5, fYLo, paints.fIndicator); SkString label; label.printf("%0.3g", fValLo); - canvas->drawText(label.c_str(), label.size(), fBounds.fLeft + 5, fYLo - 5, paints.fValue); - canvas->drawText(fName.c_str(), fName.size(), fBounds.fLeft, fBounds.bottom() + 11, + canvas->drawString(label, fBounds.fLeft + 5, fYLo - 5, paints.fValue); + canvas->drawString(fName, fBounds.fLeft, fBounds.bottom() + 11, paints.fLabel); } }; @@ -634,7 +634,7 @@ struct BiControl : public UniControl { if (yPos < fYLo + 10) { yPos = fYLo + 10; } - canvas->drawText(label.c_str(), label.size(), fBounds.fLeft + 5, yPos - 5, paints.fValue); + canvas->drawString(label, fBounds.fLeft + 5, yPos - 5, paints.fValue); SkRect fill = { fBounds.fLeft, fYLo, fBounds.fRight, yPos }; canvas->drawRect(fill, paints.fFill); } @@ -1819,11 +1819,11 @@ void AAGeometryView::draw_legend(SkCanvas* canvas) { SkScalar bottomOffset = this->height() - 10; for (int index = kKeyCommandCount - 1; index >= 0; --index) { bottomOffset -= 15; - canvas->drawText(kKeyCommandList[index].fDescriptionL, - strlen(kKeyCommandList[index].fDescriptionL), this->width() - 160, bottomOffset, + canvas->drawString(kKeyCommandList[index].fDescriptionL, + this->width() - 160, bottomOffset, fLegendLeftPaint); - canvas->drawText(kKeyCommandList[index].fDescriptionR, - strlen(kKeyCommandList[index].fDescriptionR), this->width() - 20, bottomOffset, + canvas->drawString(kKeyCommandList[index].fDescriptionR, + this->width() - 20, bottomOffset, fLegendRightPaint); } } diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 37a0c4b871..a8d24589ce 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -544,7 +544,7 @@ protected: gLightingColors[index].fAdd)); #endif - canvas->drawText(str.c_str(), str.size(), x, y, paint); + canvas->drawString(str, x, y, paint); SkRect oval = { x, y - SkIntToScalar(40), x + SkIntToScalar(40), y }; paint.setStyle(SkPaint::kStroke_Style); canvas->drawOval(oval, paint); diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp index 2b047c2abe..e70530ab96 100644 --- a/samplecode/SampleAnimatedText.cpp +++ b/samplecode/SampleAnimatedText.cpp @@ -126,8 +126,8 @@ protected: canvas->restore(); paint.setTextSize(16); -// canvas->drawText(outString.c_str(), outString.size(), 512.f, 540.f, paint); - canvas->drawText(modeString.c_str(), modeString.size(), 768.f, 540.f, paint); +// canvas->drawString(outString, 512.f, 540.f, paint); + canvas->drawString(modeString, 768.f, 540.f, paint); } bool onAnimate(const SkAnimTimer& timer) override { diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index f95833e830..abdcdec2fd 100644 --- a/samplecode/SampleArc.cpp +++ b/samplecode/SampleArc.cpp @@ -127,7 +127,7 @@ protected: str.appendScalar(start); str.append(", "); str.appendScalar(sweep); - canvas->drawText(str.c_str(), str.size(), rect.centerX(), + canvas->drawString(str, rect.centerX(), rect.fBottom + paint.getTextSize() * 5/4, paint); } diff --git a/samplecode/SampleBevel.cpp b/samplecode/SampleBevel.cpp index fce8885c48..3f193cfc45 100644 --- a/samplecode/SampleBevel.cpp +++ b/samplecode/SampleBevel.cpp @@ -90,7 +90,7 @@ protected: labelPaint.setColor(0xFFFFFFFF); labelPaint.setTextSize(12.0f); - canvas->drawText(label.c_str(), label.size(), 0, kLabelHeight - 6.0f, labelPaint); + canvas->drawString(label, 0, kLabelHeight - 6.0f, labelPaint); } SkString fName; diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp index ebfe3bbc6d..ccf2d26fe9 100644 --- a/samplecode/SampleBitmapRect.cpp +++ b/samplecode/SampleBitmapRect.cpp @@ -171,7 +171,7 @@ static void make_big_bitmap(SkBitmap* bm) { SkCanvas canvas(*bm); - canvas.drawText(gText, strlen(gText), 0, paint.getTextSize()*4/5, paint); + canvas.drawString(gText, 0, paint.getTextSize()*4/5, paint); } class BitmapRectView2 : public SampleView { diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp index 4c4082cea0..a2f90a7746 100644 --- a/samplecode/SampleBlur.cpp +++ b/samplecode/SampleBlur.cpp @@ -111,13 +111,13 @@ protected: SkScalar x = SkIntToScalar(70); SkScalar y = SkIntToScalar(400); paint.setColor(SK_ColorBLACK); - canvas->drawText("Hamburgefons Style", 18, x, y, paint); - canvas->drawText("Hamburgefons Style", 18, x, y + SkIntToScalar(50), paint); + canvas->drawString("Hamburgefons Style", x, y, paint); + canvas->drawString("Hamburgefons Style", x, y + SkIntToScalar(50), paint); paint.setMaskFilter(nullptr); paint.setColor(SK_ColorWHITE); x -= SkIntToScalar(2); y -= SkIntToScalar(2); - canvas->drawText("Hamburgefons Style", 18, x, y, paint); + canvas->drawString("Hamburgefons Style", x, y, paint); } canvas->restore(); flags = SkBlurMaskFilter::kHighQuality_BlurFlag; diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp index 41192fbbc4..05b5a25e5b 100644 --- a/samplecode/SampleClip.cpp +++ b/samplecode/SampleClip.cpp @@ -27,7 +27,7 @@ static void show_text(SkCanvas* canvas, bool doAA) { for (int i = 0; i < 200; ++i) { paint.setColor((SK_A32_MASK << SK_A32_SHIFT) | rand.nextU()); - canvas->drawText("Hamburgefons", 12, + canvas->drawString("Hamburgefons", rand.nextSScalar1() * W, rand.nextSScalar1() * H + 20, paint); } diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp index b9c930742e..af7f38ede9 100644 --- a/samplecode/SampleComplexClip.cpp +++ b/samplecode/SampleComplexClip.cpp @@ -129,14 +129,14 @@ protected: SkScalar txtX = SkIntToScalar(55); paint.setColor(colorA); const char* aTxt = invA ? "InverseA " : "A "; - canvas->drawText(aTxt, strlen(aTxt), txtX, SkIntToScalar(220), paint); + canvas->drawString(aTxt, txtX, SkIntToScalar(220), paint); txtX += paint.measureText(aTxt, strlen(aTxt)); paint.setColor(SK_ColorBLACK); - canvas->drawText(gOps[op].fName, strlen(gOps[op].fName), + canvas->drawString(gOps[op].fName, txtX, SkIntToScalar(220), paint); txtX += paint.measureText(gOps[op].fName, strlen(gOps[op].fName)); paint.setColor(colorB); - canvas->drawText("B", 1, txtX, SkIntToScalar(220), paint); + canvas->drawString("B", txtX, SkIntToScalar(220), paint); canvas->translate(SkIntToScalar(250),0); } diff --git a/samplecode/SampleDegenerateTwoPtRadials.cpp b/samplecode/SampleDegenerateTwoPtRadials.cpp index f171202249..cdd5e1c2d1 100644 --- a/samplecode/SampleDegenerateTwoPtRadials.cpp +++ b/samplecode/SampleDegenerateTwoPtRadials.cpp @@ -72,7 +72,7 @@ protected: SkPaint paint; paint.setAntiAlias(true); paint.setColor(SK_ColorBLACK); - canvas->drawText(txt.c_str(), txt.size(), l + w/2 + w*DELTA_SCALE*delta, t + h + SK_Scalar1 * 10, paint); + canvas->drawString(txt, l + w/2 + w*DELTA_SCALE*delta, t + h + SK_Scalar1 * 10, paint); } bool onAnimate(const SkAnimTimer& timer) override { diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp index c49cdadcb3..1acc1afa31 100644 --- a/samplecode/SampleFatBits.cpp +++ b/samplecode/SampleFatBits.cpp @@ -462,7 +462,7 @@ protected: paint.setAntiAlias(true); paint.setTextSize(16); paint.setColor(SK_ColorBLUE); - canvas->drawText(str.c_str(), str.size(), 10, 16, paint); + canvas->drawString(str, 10, 16, paint); } } diff --git a/samplecode/SampleFilter.cpp b/samplecode/SampleFilter.cpp index 00f3853d4e..60dd7e090d 100644 --- a/samplecode/SampleFilter.cpp +++ b/samplecode/SampleFilter.cpp @@ -59,7 +59,7 @@ static SkScalar draw_row(SkCanvas* canvas, const SkBitmap& bm) { paint.setAntiAlias(true); const char* name = sk_tool_utils::colortype_name(bm.colorType()); - canvas->drawText(name, strlen(name), x, SkIntToScalar(bm.height())*scale*5/8, + canvas->drawString(name, x, SkIntToScalar(bm.height())*scale*5/8, paint); canvas->translate(SkIntToScalar(48), 0); diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp index 9b2298a0b4..e6134bdb22 100644 --- a/samplecode/SampleFilter2.cpp +++ b/samplecode/SampleFilter2.cpp @@ -89,7 +89,7 @@ protected: s.appendS32(paint.isDither()); s.append(" filter="); s.appendS32(paint.getFilterQuality() != kNone_SkFilterQuality); - canvas->drawText(s.c_str(), s.size(), x + W/2, + canvas->drawString(s, x + W/2, y - p.getTextSize(), p); } if (k+j == 2) { @@ -99,7 +99,7 @@ protected: SkString s; s.append(" depth="); s.appendS32(fBitmaps[i].colorType() == kRGB_565_SkColorType ? 16 : 32); - canvas->drawText(s.c_str(), s.size(), x + W + SkIntToScalar(4), + canvas->drawString(s, x + W + SkIntToScalar(4), y + H/2, p); } } diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 5524f1e852..3690612870 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -257,7 +257,7 @@ static void make_g_bitmap(SkBitmap& bitmap) { paint.setColor(0xFF884422); paint.setTextSize(SkIntToScalar(kBitmapSize/2)); const char* str = "g"; - canvas.drawText(str, strlen(str), SkIntToScalar(kBitmapSize/8), + canvas.drawString(str, SkIntToScalar(kBitmapSize/8), SkIntToScalar(kBitmapSize/4), paint); } @@ -339,7 +339,7 @@ static void drawSomething(SkCanvas* canvas) { canvas->drawCircle(SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/3), paint); paint.setColor(SK_ColorBLACK); paint.setTextSize(SkIntToScalar(kBitmapSize/3)); - canvas->drawText("Picture", 7, SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/4), paint); + canvas->drawString("Picture", SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/4), paint); } static void rand_color_table(uint8_t* table) { diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp index 78aa20e1bc..43cd505721 100644 --- a/samplecode/SampleFilterQuality.cpp +++ b/samplecode/SampleFilterQuality.cpp @@ -277,14 +277,14 @@ protected: paint.setTextSize(36); SkString str; str.appendScalar(fScale); - canvas->drawText(str.c_str(), str.size(), textX, 100, paint); + canvas->drawString(str, textX, 100, paint); str.reset(); str.appendScalar(fAngle); - canvas->drawText(str.c_str(), str.size(), textX, 150, paint); + canvas->drawString(str, textX, 150, paint); str.reset(); str.appendScalar(trans[0]); - canvas->drawText(str.c_str(), str.size(), textX, 200, paint); + canvas->drawString(str, textX, 200, paint); str.reset(); str.appendScalar(trans[1]); - canvas->drawText(str.c_str(), str.size(), textX, 250, paint); + canvas->drawString(str, textX, 250, paint); } bool onAnimate(const SkAnimTimer& timer) override { diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp index 95970e7f45..5fbba699df 100644 --- a/samplecode/SampleIdentityScale.cpp +++ b/samplecode/SampleIdentityScale.cpp @@ -71,7 +71,7 @@ protected: } canvas->drawBitmap( fBM, 100, 100, &paint ); canvas->restore(); - canvas->drawText( text, strlen(text), 100, 400, paint ); + canvas->drawString(text, 100, 400, paint ); this->inval(nullptr); } diff --git a/samplecode/SamplePolyToPoly.cpp b/samplecode/SamplePolyToPoly.cpp index 8594c2b88f..f947251b55 100644 --- a/samplecode/SamplePolyToPoly.cpp +++ b/samplecode/SamplePolyToPoly.cpp @@ -110,7 +110,7 @@ protected: float y = D/2 - (fm.fAscent + fm.fDescent)/2; SkString str; str.appendS32(count); - canvas->drawText(str.c_str(), str.size(), + canvas->drawString(str, x, y, *paint); diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp index 30b8603bcf..ea5f97fa2a 100644 --- a/samplecode/SampleQuadStroker.cpp +++ b/samplecode/SampleQuadStroker.cpp @@ -321,7 +321,7 @@ protected: label.appendS32(index); SkRect dot = SkRect::MakeXYWH(pos.x() - 2, pos.y() - 2, 4, 4); canvas->drawRect(dot, labelP); - canvas->drawText(label.c_str(), label.size(), + canvas->drawString(label, pos.x() - tan.x() * 1.25f, pos.y() - tan.y() * 1.25f, labelP); } } @@ -381,7 +381,7 @@ protected: if (0 == index % 10) { SkString label; label.appendS32(index); - canvas->drawText(label.c_str(), label.size(), + canvas->drawString(label, pos.x() + tan.x() * 1.25f, pos.y() + tan.y() * 1.25f, paint); } } @@ -509,9 +509,9 @@ protected: paint.setColor(0xFF000000); paint.setTextSize(11.0f); paint.setStyle(SkPaint::kFill_Style); - canvas->drawText(label.c_str(), label.size(), bounds.fLeft + 5, yPos - 5, paint); + canvas->drawString(label, bounds.fLeft + 5, yPos - 5, paint); paint.setTextSize(13.0f); - canvas->drawText(name, strlen(name), bounds.fLeft, bounds.bottom() + 11, paint); + canvas->drawString(name, bounds.fLeft, bounds.bottom() + 11, paint); } void setForGeometry() { diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp index 4ff28b2a6c..0657464ef1 100644 --- a/samplecode/SampleRectanizer.cpp +++ b/samplecode/SampleRectanizer.cpp @@ -119,13 +119,13 @@ protected: 100.0f * totArea / ((float)kWidth*kHeight), fCurRandRect, kNumRandRects); - canvas->drawText(str.c_str(), str.size(), 50, kHeight + 50, blackBigFont); + canvas->drawString(str, 50, kHeight + 50, blackBigFont); str.printf("Press \'j\' to toggle rectanizer"); - canvas->drawText(str.c_str(), str.size(), 50, kHeight + 100, blackBigFont); + canvas->drawString(str, 50, kHeight + 100, blackBigFont); str.printf("Press \'h\' to toggle rects"); - canvas->drawText(str.c_str(), str.size(), 50, kHeight + 150, blackBigFont); + canvas->drawString(str, 50, kHeight + 150, blackBigFont); this->inval(nullptr); } diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp index 082ff22286..1fee2fa7f9 100644 --- a/samplecode/SampleRegion.cpp +++ b/samplecode/SampleRegion.cpp @@ -226,7 +226,7 @@ protected: paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(20)); paint.setColor(hilite ? SK_ColorRED : 0x40FF0000); - canvas->drawText(text, strlen(text), loc.fX, loc.fY, paint); + canvas->drawString(text, loc.fX, loc.fY, paint); } void drawPredicates(SkCanvas* canvas, const SkPoint pts[]) { @@ -373,7 +373,7 @@ protected: canvas->translate(0, SkIntToScalar(200)); for (size_t op = 0; op < SK_ARRAY_COUNT(gOps); op++) { - canvas->drawText(gOps[op].fName, strlen(gOps[op].fName), SkIntToScalar(75), SkIntToScalar(50), textPaint); + canvas->drawString(gOps[op].fName, SkIntToScalar(75), SkIntToScalar(50), textPaint); this->drawRgnOped(canvas, gOps[op].fOp, gOps[op].fColor); diff --git a/samplecode/SampleShip.cpp b/samplecode/SampleShip.cpp index 9d65b6f690..08f794abab 100644 --- a/samplecode/SampleShip.cpp +++ b/samplecode/SampleShip.cpp @@ -150,7 +150,7 @@ protected: paint.setColor(SK_ColorBLACK); canvas->drawRect(SkRect::MakeXYWH(0, 0, 200, 24), paint); paint.setColor(SK_ColorWHITE); - canvas->drawText(outString.c_str(), outString.size(), 5, 15, paint); + canvas->drawString(outString, 5, 15, paint); this->inval(nullptr); } diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp index e69625e9bf..3f84482f4f 100644 --- a/samplecode/SampleStrokePath.cpp +++ b/samplecode/SampleStrokePath.cpp @@ -170,7 +170,7 @@ protected: if (x) { paint.setMaskFilter(SkBlurMaskFilter::Make(gStyle[x - 1], sigma)); } - canvas->drawText("Title Bar", 9, x*SkIntToScalar(100), y*SkIntToScalar(30), paint); + canvas->drawString("Title Bar", x*SkIntToScalar(100), y*SkIntToScalar(30), paint); sigma *= 0.75f; } diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp index 3bb90562fa..fd66de25ca 100644 --- a/samplecode/SampleSubpixelTranslate.cpp +++ b/samplecode/SampleSubpixelTranslate.cpp @@ -71,7 +71,7 @@ protected: canvas->drawBitmapRect( fBM, r, &paint ); } - canvas->drawText( "AA Scaled", strlen("AA Scaled"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize/2, paint ); + canvas->drawString( "AA Scaled", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize/2, paint ); paint.setAntiAlias(false); for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) { @@ -79,7 +79,7 @@ protected: SkRect r = SkRect::MakeXYWH( fCurPos.fX + i * (fSize + 10), fCurPos.fY + fSize + 10, fSize, fSize ); canvas->drawBitmapRect( fBM, r, &paint ); } - canvas->drawText( "Scaled", strlen("Scaled"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize + 10 + fSize/2, paint ); + canvas->drawString( "Scaled", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize + 10 + fSize/2, paint ); paint.setAntiAlias(true); for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) { @@ -87,7 +87,7 @@ protected: canvas->drawBitmap( fBM, fCurPos.fX + i * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10), &paint ); } - canvas->drawText( "AA No Scale", strlen("AA No Scale"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fSize/2, paint ); + canvas->drawString( "AA No Scale", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fSize/2, paint ); paint.setAntiAlias(false); for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) { @@ -95,7 +95,7 @@ protected: canvas->drawBitmap( fBM, fCurPos.fX + i * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10, &paint ); } - canvas->drawText( "No Scale", strlen("No Scale"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10 + fSize/2, paint ); + canvas->drawString( "No Scale", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10 + fSize/2, paint ); fCurPos.fX += fHorizontalVelocity; diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 8325cd7755..12f345cd33 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -95,7 +95,7 @@ protected: paint.setFlags(paint.getFlags() | SkPaint::kAntiAlias_Flag | SkPaint::kDevKernText_Flag); paint.setTextSize(SkIntToScalar(14)); - canvas.drawText(s, strlen(s), SkIntToScalar(8), SkIntToScalar(14), paint); + canvas.drawString(s, SkIntToScalar(8), SkIntToScalar(14), paint); } static void fill_pts(SkPoint pts[], size_t n, SkRandom* rand) { @@ -119,7 +119,7 @@ protected: // canvas->translate(0, SkIntToScalar(50)); - // canvas->drawText(style, strlen(style), SkIntToScalar(20), SkIntToScalar(20), paint); + // canvas->drawString(style, SkIntToScalar(20), SkIntToScalar(20), paint); paint.setTypeface(SkTypeface::MakeFromFile("/skimages/samplefont.ttf")); paint.setAntiAlias(true); diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp index 8286177ae7..c357e6d8c2 100644 --- a/samplecode/SampleTextAlpha.cpp +++ b/samplecode/SampleTextAlpha.cpp @@ -59,7 +59,7 @@ protected: paint.setColor(rand.nextU() | (0xFF << 24)); paint.setTextSize(SkIntToScalar(ps)); paint.setTextSize(SkIntToScalar(24)); - canvas->drawText(str, strlen(str), x, y, paint); + canvas->drawString(str, x, y, paint); y += paint.getFontMetrics(nullptr); } } diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp index 84346b0f72..e09354ec72 100644 --- a/samplecode/SampleTiling.cpp +++ b/samplecode/SampleTiling.cpp @@ -111,7 +111,7 @@ protected: str.printf("[%s,%s]", gModeNames[kx], gModeNames[ky]); p.setTextAlign(SkPaint::kCenter_Align); - textCanvas->drawText(str.c_str(), str.size(), x + r.width()/2, y, p); + textCanvas->drawString(str, x + r.width()/2, y, p); x += r.width() * 4 / 3; } @@ -143,7 +143,7 @@ protected: p.setAntiAlias(true); p.setLooper(fLooper); str.printf("%s, %s", gConfigNames[i], gFilterNames[j]); - textCanvas->drawText(str.c_str(), str.size(), x, y + r.height() * 2 / 3, p); + textCanvas->drawString(str, x, y + r.height() * 2 / 3, p); } y += r.height() * 4 / 3; diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp index be42d23bbd..cd05fcffd4 100644 --- a/samplecode/SampleUnpremul.cpp +++ b/samplecode/SampleUnpremul.cpp @@ -93,7 +93,7 @@ protected: } else { failure.printf("Failed to decode %s", fCurrFile.c_str()); } - canvas->drawText(failure.c_str(), failure.size(), 0, height, paint); + canvas->drawString(failure, 0, height, paint); return; } @@ -101,16 +101,16 @@ protected: SkString header(SkOSPath::Basename(fCurrFile.c_str())); header.appendf(" [%dx%d] %s", fBitmap.width(), fBitmap.height(), (fPremul ? "premultiplied" : "unpremultiplied")); - canvas->drawText(header.c_str(), header.size(), 0, height, paint); + canvas->drawString(header, 0, height, paint); canvas->translate(0, height); // Help messages header.printf("Press '%c' to move to the next image.'", fNextImageChar); - canvas->drawText(header.c_str(), header.size(), 0, height, paint); + canvas->drawString(header, 0, height, paint); canvas->translate(0, height); header.printf("Press '%c' to toggle premultiplied decode.", fTogglePremulChar); - canvas->drawText(header.c_str(), header.size(), 0, height, paint); + canvas->drawString(header, 0, height, paint); // Now draw the image itself. canvas->translate(height * 2, height * 2); diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp index 9ca2e78c0c..87427fc8f3 100644 --- a/samplecode/SampleXfer.cpp +++ b/samplecode/SampleXfer.cpp @@ -75,7 +75,7 @@ protected: paint.setTextSize(16); paint.setTextAlign(SkPaint::kCenter_Align); paint.setLCDRenderText(true); - canvas->drawText(fLabel.c_str(), fLabel.size(), r.centerX(), r.fTop + 0.68f * r.height(), paint); + canvas->drawString(fLabel, r.centerX(), r.fTop + 0.68f * r.height(), paint); } Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override { diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index 2a17e6b1b8..ff198bcf8b 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -160,7 +160,7 @@ protected: canvas->drawRect(r, p); const char* label = SkBlendMode_Name(gModes[i]); - canvas->drawText(label, strlen(label), + canvas->drawString(label, x + w/2, y - labelP.getTextSize()/2, labelP); x += w + SkIntToScalar(10); if ((i % W) == W - 1) { |