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

QScroller: Remove workaround for timer start

Browse Source 
The CI is flakey, likely due to missing timer events. Instead of
skipping the first event, start the timer only when the new state has
been set.

Task-number: QTBUG-30133
Pick-to: 6.8
Change-Id: Ia58e4b091d8791d1b77642ded67312bc3927d0b7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit c093b57c8696079fc3408796e0e17c62a990bce2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thomas Moerschell 2025-02-17 20:58:56 +01:00 committed by Qt Cherry-pick Bot
parent 5dddcc3cdc
commit 69f78f3cbe
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/widgets/util/qscroller.cpp
View File

@ -154,9 +154,7 @@ static qreal progressForValue(const QEasingCurve &curve, qreal value)
class QScrollTimer : public QAbstractAnimation
{
public:
QScrollTimer(QScrollerPrivate *_d)
: QAbstractAnimation(_d), d(_d), ignoreUpdate(false), skip(0)
{ }
QScrollTimer(QScrollerPrivate *_d) : QAbstractAnimation(_d), d(_d), skip(0) {}
int duration() const override
{
@ -165,28 +163,21 @@ public:
void start()
{
// QAbstractAnimation::start() will immediately call
// updateCurrentTime(), but our state is not set correctly yet
ignoreUpdate = true;
QAbstractAnimation::start();
ignoreUpdate = false;
skip = 0;
}
protected:
void updateCurrentTime(int /*currentTime*/) override
{
if (!ignoreUpdate) {
if (++skip >= d->frameRateSkip()) {
skip = 0;
d->timerTick();
}
if (++skip >= d->frameRateSkip()) {
skip = 0;
d->timerTick();
}
}
private:
QScrollerPrivate *d;
bool ignoreUpdate;
int skip;
};
#endif // animation
@ -1658,6 +1649,7 @@ void QScrollerPrivate::setState(QScroller::State newstate)
{
Q_Q(QScroller);
bool sendLastScroll = false;
bool startTimer = false;
if (state == newstate)
return;
@ -1690,19 +1682,24 @@ void QScrollerPrivate::setState(QScroller::State newstate)
dragDistance = QPointF(0, 0);
#if QT_CONFIG(animation)
if (state == QScroller::Pressed)
scrollTimer->start();
startTimer = true;
#endif
break;
case QScroller::Scrolling:
#if QT_CONFIG(animation)
scrollTimer->start();
startTimer = true;
#endif
break;
}
qSwap(state, newstate);
#if QT_CONFIG(animation)
// Only start the timer after the state has been changed
if (startTimer)
scrollTimer->start();
#endif
if (sendLastScroll) {
QScrollEvent se(contentPosition, overshootPosition, QScrollEvent::ScrollFinished);
sendEvent(target, &se);