From df2713c447755a8b0ec7801d797d5ee9650b4bc2 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Tue, 9 Jan 2018 15:51:21 -0500 Subject: [skotty] Minor tools tweaks * fix "show inval" persistency in SkottySlide * add frame-stamp to DM film strip TBR= Change-Id: I965b28fa25b4d6ddfa1ddf80f5f9187dff3f943c Reviewed-on: https://skia-review.googlesource.com/92941 Reviewed-by: Florin Malita Commit-Queue: Florin Malita --- dm/DMSrcSink.cpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 1685dcbe96..d0c468159e 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1341,11 +1341,13 @@ Error SkottySrc::draw(SkCanvas* canvas) const { canvas->drawColor(SK_ColorWHITE); - SkPaint paint; + SkPaint paint, clockPaint; paint.setColor(0xffa0a0a0); paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(0); + clockPaint.setTextSize(12); + const auto ip = fAnimation->inPoint() * 1000 / fAnimation->frameRate(), op = fAnimation->outPoint() * 1000 / fAnimation->frameRate(), fr = (op - ip) / (kTileCount * kTileCount - 1); @@ -1360,15 +1362,21 @@ Error SkottySrc::draw(SkCanvas* canvas) const { canvas->drawLine(x + .5f, 0, x + .5f, canvas_size.height(), paint); SkRect dest = SkRect::MakeXYWH(x, y, fTileSize.width(), fTileSize.height()); - SkAutoCanvasRestore acr(canvas, true); - canvas->clipRect(dest); - canvas->concat(SkMatrix::MakeRectToRect(SkRect::MakeSize(fAnimation->size()), - dest, - SkMatrix::kFill_ScaleToFit)); - const auto t = fr * (i * kTileCount + j); - fAnimation->animationTick(t); - fAnimation->render(canvas); + { + SkAutoCanvasRestore acr(canvas, true); + canvas->clipRect(dest); + canvas->concat(SkMatrix::MakeRectToRect(SkRect::MakeSize(fAnimation->size()), + dest, + SkMatrix::kFill_ScaleToFit)); + + fAnimation->animationTick(t); + fAnimation->render(canvas); + } + + const auto label = SkStringPrintf("%.3f", t); + canvas->drawText(label.c_str(), label.size(), dest.x(), + dest.bottom(), clockPaint); } } -- cgit v1.2.3