From: joogab.yun Date: Wed, 14 Jun 2023 06:03:09 +0000 (+0900) Subject: Pass combinedAlpha when not complexContent. X-Git-Tag: accepted/tizen/unified/20230620.022449^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ff57073c91677242e2bd1014bb94037ec71200e;p=platform%2Fcore%2Fuifw%2Flottie-player.git Pass combinedAlpha when not complexContent. Change-Id: I3daaca93a6fa6bb3a71ccd4d98d263ae966b61ee --- diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp index 15e00da..d6c9ed3 100644 --- a/src/lottie/lottieitem.cpp +++ b/src/lottie/lottieitem.cpp @@ -1317,9 +1317,9 @@ renderer::Stroke::Stroke(model::Stroke *data) static vthread_local std::vector Dash_Vector; bool renderer::Stroke::updateContent(int frameNo, const VMatrix &matrix, - float) + float alpha) { - auto combinedAlpha = mModel.opacity(frameNo); + auto combinedAlpha = alpha * mModel.opacity(frameNo); auto color = mModel.color(frameNo).toColor(combinedAlpha); VBrush brush(color); diff --git a/src/lottie/lottieitem_capi.cpp b/src/lottie/lottieitem_capi.cpp index 31ca54a..048e356 100644 --- a/src/lottie/lottieitem_capi.cpp +++ b/src/lottie/lottieitem_capi.cpp @@ -88,7 +88,7 @@ void renderer::Layer::buildLayerNode() mCApiData = std::make_unique(); clayer().keypath = name(); } - if (complexContent()) clayer().mAlpha = uint8_t(combinedAlpha() * 255.f); + if (!complexContent()) clayer().mAlpha = uint8_t(combinedAlpha() * 255.f); clayer().mVisible = visible(); // update matte if (hasMatte()) {