diff options
Diffstat (limited to 'samplecode/SampleQuadStroker.cpp')
| -rw-r--r-- | samplecode/SampleQuadStroker.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp index ca19de2550..10e9bbc678 100644 --- a/samplecode/SampleQuadStroker.cpp +++ b/samplecode/SampleQuadStroker.cpp @@ -9,6 +9,7 @@ #include "SkBlendMode.h" #include "SkCanvas.h" #include "SkColor.h" +#include "SkFont.h" #include "SkGeometry.h" #include "SkImageInfo.h" #include "SkMatrix.h" @@ -325,6 +326,7 @@ protected: SkPaint paint, labelP; paint.setColor(color); labelP.setColor(color & 0xff5f9f5f); + SkFont font; SkPoint pos, tan; int index = 0; for (SkScalar dist = 0; dist <= total; dist += delta) { @@ -339,7 +341,7 @@ protected: SkRect dot = SkRect::MakeXYWH(pos.x() - 2, pos.y() - 2, 4, 4); canvas->drawRect(dot, labelP); canvas->drawString(label, - pos.x() - tan.x() * 1.25f, pos.y() - tan.y() * 1.25f, labelP); + pos.x() - tan.x() * 1.25f, pos.y() - tan.y() * 1.25f, font, labelP); } } ++index; @@ -399,7 +401,7 @@ protected: SkString label; label.appendS32(index); canvas->drawString(label, - pos.x() + tan.x() * 1.25f, pos.y() + tan.y() * 1.25f, paint); + pos.x() + tan.x() * 1.25f, pos.y() + tan.y() * 1.25f, SkFont(), paint); } } } @@ -525,11 +527,11 @@ protected: SkString label; label.printf("%0.3g", value); paint.setColor(0xFF000000); - paint.setTextSize(11.0f); paint.setStyle(SkPaint::kFill_Style); - canvas->drawString(label, bounds.fLeft + 5, yPos - 5, paint); - paint.setTextSize(13.0f); - canvas->drawString(name, bounds.fLeft, bounds.bottom() + 11, paint); + SkFont font(nullptr, 11.0f); + canvas->drawString(label, bounds.fLeft + 5, yPos - 5, font, paint); + font.setSize(13.0f); + canvas->drawString(name, bounds.fLeft, bounds.bottom() + 11, font, paint); } void setForGeometry() { |