aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCary Clark <caryclark@skia.org>2018-10-25 08:15:36 -0400
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-10-25 12:20:31 +0000
commit92694bea2840317e62de361d965f11f68cccd009 (patch)
treed0e04d52939fbb9243a8d9f9980d5106c331baf0 /docs
parent3fed65ac8c87e34fbee328aaaf91e518c61cc5b7 (diff)
downloadskqp-92694bea2840317e62de361d965f11f68cccd009.tar.gz
fix examples with vertical text
a few examples used vertical text for illustrations; fix them. The vertical text examples broke the bookmaker housekeeper bot. NOTRY=true TBR=reed@google.com Docs-Preview: https://skia.org/?cl=164901 Bug: skia: Change-Id: I13e59025eda7777cdd47b9db9e26a882595e7534 Reviewed-on: https://skia-review.googlesource.com/c/164901 Commit-Queue: Cary Clark <caryclark@skia.org> Auto-Submit: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/SkImageInfo_Reference.bmh3
-rw-r--r--docs/SkImage_Reference.bmh3
-rw-r--r--docs/SkPaint_Reference.bmh41
3 files changed, 23 insertions, 24 deletions
diff --git a/docs/SkImageInfo_Reference.bmh b/docs/SkImageInfo_Reference.bmh
index 460d9e6f99..76749b0923 100644
--- a/docs/SkImageInfo_Reference.bmh
+++ b/docs/SkImageInfo_Reference.bmh
@@ -1473,9 +1473,8 @@ Returns pixel row count.
SkImageInfo imageInfo = source.info();
SkPaint paint;
paint.setTextAlign(SkPaint::kCenter_Align);
- paint.setVerticalText(true);
canvas->drawLine(imageInfo.width() + 10, 0, imageInfo.width() + 10, imageInfo.height(), paint);
- canvas->drawString("height", imageInfo.width() + 25, imageInfo.height() / 2, paint);
+ canvas->drawString("height", imageInfo.width() + 34, imageInfo.height() / 2, paint);
##
#SeeAlso width SkBitmap::height SkPixelRef::height SkImage::height SkSurface::height
diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh
index 7ca584ab43..99e4cc30c9 100644
--- a/docs/SkImage_Reference.bmh
+++ b/docs/SkImage_Reference.bmh
@@ -1001,9 +1001,8 @@ Returns pixel row count.
canvas->translate(image->width(), 0);
SkPaint paint;
paint.setTextAlign(SkPaint::kCenter_Align);
- paint.setVerticalText(true);
canvas->drawLine(10, 0, 10, image->height(), paint);
- canvas->drawString("height", 25, image->height() / 2, paint);
+ canvas->drawString("height", 34, image->height() / 2, paint);
##
#SeeAlso dimensions() width()
diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh
index 97628999bc..878251d9ac 100644
--- a/docs/SkPaint_Reference.bmh
+++ b/docs/SkPaint_Reference.bmh
@@ -4613,27 +4613,28 @@ void draw(SkCanvas* canvas) {
#Description
Text intercepts draw on either side of, but not inside, Glyphs in a run.
##
- void draw(SkCanvas* canvas) {
- SkPaint paint;
- paint.setTextSize(120);
- paint.setVerticalText(true);
- SkPoint textPos[] = {{ 60, 40 }, { 60, 140 }};
- SkScalar bounds[] = { 56, 64 };
- const char str[] = "A-";
- int len = sizeof(str) - 1;
- int count = paint.getPosTextIntercepts(str, len, textPos, bounds, nullptr);
- std::vector<SkScalar> intervals;
- intervals.resize(count);
- (void) paint.getPosTextIntercepts(str, len, textPos, bounds, &intervals.front());
- canvas->drawPosText(str, len, textPos, paint);
- paint.setColor(SK_ColorRED);
- SkScalar y = textPos[0].fY;
- for (int i = 0; i < count; i+= 2) {
- canvas->drawRect({bounds[0], y, bounds[1], intervals[i]}, paint);
- y = intervals[i + 1];
- }
- canvas->drawRect({bounds[0], intervals[count - 1], bounds[1], 240}, paint);
+ void draw(SkCanvas* canvas) {
+ SkPaint paint;
+ paint.setTextSize(120);
+ SkPoint textPos[] = {{ 60, 90 }, { 120, 90 }};
+ SkScalar bounds[] = { 40, 70 };
+ const char str[] = "A+";
+ int len = sizeof(str) - 1;
+ int count = paint.getPosTextIntercepts(str, len, textPos, bounds, nullptr);
+ std::vector<SkScalar> intervals;
+ intervals.resize(count);
+ (void) paint.getPosTextIntercepts(str, len, textPos, bounds, &intervals.front());
+ canvas->drawPosText(str, len, textPos, paint);
+ paint.setColor(SK_ColorRED);
+ SkScalar x = textPos[0].fX;
+ for (int i = 0; i < count; i+= 2) {
+ canvas->drawRect({x, bounds[0], intervals[i], bounds[1]}, paint);
+ x = intervals[i + 1];
}
+ if (count) {
+ canvas->drawRect({intervals[count - 1], bounds[0], 180, bounds[1]}, paint);
+ }
+ }
##
##