AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[skottie] Fix viewer slide sizing on Android

Browse Source 
TBR=

Change-Id: Ibbf4d22ba01e39b80c1f76d9af6bef647454996f
Reviewed-on: https://skia-review.googlesource.com/106160
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Florin Malita 2018-02-09 11:15:32 -05:00 committed by Skia Commit-Bot
parent cd5099c75f
commit c378fdcad8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/viewer/SkottieSlide.cpp
View File

@ -16,8 +16,9 @@ SkottieSlide::SkottieSlide(const SkString& name, const SkString& path)
fName = name;
}
void SkottieSlide::load(SkScalar, SkScalar) {
void SkottieSlide::load(SkScalar w, SkScalar h) {
fAnimation = skottie::Animation::MakeFromFile(fPath.c_str());
fWinSize = SkSize::Make(w, h);
fTimeBase = 0; // force a time reset
if (fAnimation) {
@ -37,13 +38,14 @@ void SkottieSlide::unload() {
}
SkISize SkottieSlide::getDimensions() const {
return fAnimation? fAnimation->size().toCeil() : SkISize::Make(0, 0);
// We always scale to fill the window.
return fWinSize.toCeil();
}
void SkottieSlide::draw(SkCanvas* canvas) {
if (fAnimation) {
SkAutoCanvasRestore acr(canvas, true);
const SkRect dstR = SkRect::Make(canvas->imageInfo().bounds());
const auto dstR = SkRect::MakeSize(fWinSize);
fAnimation->render(canvas, &dstR);
}
}

1
tools/viewer/SkottieSlide.h
View File

@ -31,6 +31,7 @@ public:
private:
SkString fPath;
std::unique_ptr<skottie::Animation> fAnimation;
SkSize fWinSize = SkSize::MakeEmpty();
SkMSec fTimeBase = 0;
bool fShowAnimationInval = false;