1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QVariantAnimation: fix binding loops

Browse Source 
Rewrite the logic of the setters to use removeBindingUnlessInWrapper()
and {set}ValueBypassingBindings() calls.

The logic of both setters didn't change, because previously the
pre-existing bindings were implicitly removed when calling the
assignment operator.
The new code just makes it explicit.

Task-number: QTBUG-116346
Change-Id: I475e6cd65fc73796176f257835cb67b9e70a1e34
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit df9651c3fcdd026255add31744b2f75dc2ecdd62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2023-08-25 14:37:14 +02:00 committed by Qt Cherry-pick Bot
parent d2891e5d01
commit 75dc131a28
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/animation/qvariantanimation.cpp
View File

@ -353,8 +353,9 @@ QEasingCurve QVariantAnimation::easingCurve() const
void QVariantAnimation::setEasingCurve(const QEasingCurve &easing) void QVariantAnimation::setEasingCurve(const QEasingCurve &easing)
{ {
Q_D(QVariantAnimation); Q_D(QVariantAnimation);
const bool valueChanged = easing != d->easing; d->easing.removeBindingUnlessInWrapper();
d->easing = easing; const bool valueChanged = easing != d->easing.valueBypassingBindings();
d->easing.setValueBypassingBindings(easing);
d->recalculateCurrentInterval(); d->recalculateCurrentInterval();
if (valueChanged) if (valueChanged)
d->easing.notify(); d->easing.notify();
@ -482,13 +483,12 @@ void QVariantAnimation::setDuration(int msecs)
qWarning("QVariantAnimation::setDuration: cannot set a negative duration"); qWarning("QVariantAnimation::setDuration: cannot set a negative duration");
return; return;
} }
if (d->duration == msecs) { d->duration.removeBindingUnlessInWrapper();
d->duration.removeBindingUnlessInWrapper(); if (d->duration.valueBypassingBindings() != msecs) {
return; d->duration.setValueBypassingBindings(msecs);
d->recalculateCurrentInterval();
d->duration.notify();
} }
d->duration = msecs;
d->recalculateCurrentInterval();
d->duration.notify();
} }
QBindable<int> QVariantAnimation::bindableDuration() QBindable<int> QVariantAnimation::bindableDuration()