diff options
| author | Wang Chuan <ouchuanm@outlook.com> | 2020-11-30 21:09:42 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-07 22:12:25 +0000 |
| commit | b048faf869f16891034062d2b047c9c6c12e6b3e (patch) | |
| tree | e8984e4b219a74de3414f0f82d7ecc4a3af5a0f7 | |
| parent | 28df0d61e5e2b015f6e72ca7f64fc3c535ace119 (diff) | |
QStyleAnimation: make sure the last frame of animation is rendered
Amend to 8738f09b9fc1b35e3dc78211368d87069f3071f7.
The last frame of animation might be lacked if [_skip < fps].
Fixes: QTBUG-89118
Change-Id: Ia0345e2aff7579afe2d60c4e7495bfaa1f36198c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 04fed9f77e3288f69fe89bcb8a3f1cdbe02ce219)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/widgets/styles/qstyleanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qstyleanimation.cpp b/src/widgets/styles/qstyleanimation.cpp index b9202eae69..f4a2ebe913 100644 --- a/src/widgets/styles/qstyleanimation.cpp +++ b/src/widgets/styles/qstyleanimation.cpp @@ -122,9 +122,9 @@ bool QStyleAnimation::isUpdateNeeded() const return currentTime() > _delay; } -void QStyleAnimation::updateCurrentTime(int) +void QStyleAnimation::updateCurrentTime(int time) { - if (++_skip >= _fps) { + if (++_skip >= _fps || time >= duration()) { _skip = 0; if (target() && isUpdateNeeded()) updateTarget(); |