forked from qt-creator/qt-creator
eadc9cb0e3
- Do not automatically restart particle system animation when pressing the restart button if the animation is paused. - Use own QElapsedTimer in AnimationDriver and properly handle animation driver pausing. Change-Id: Ic2924fb66fddffb8878625be8fa766f06219ca61 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
83 lines
2.4 KiB
C++
83 lines
2.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2021 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "animationdriver.h"
|
|
#include "private/qabstractanimation_p.h"
|
|
|
|
AnimationDriver::AnimationDriver(QObject *parent)
|
|
: QAnimationDriver(parent)
|
|
{
|
|
setProperty("allowNegativeDelta", true);
|
|
install();
|
|
}
|
|
|
|
AnimationDriver::~AnimationDriver()
|
|
{
|
|
|
|
}
|
|
|
|
void AnimationDriver::timerEvent(QTimerEvent *e)
|
|
{
|
|
Q_ASSERT(e->timerId() == m_timer.timerId());
|
|
Q_UNUSED(e);
|
|
|
|
quint32 old = elapsed();
|
|
// Provide same time for all users
|
|
if (m_seekerEnabled) {
|
|
m_seekerElapsed += (m_seekerPos * 100) / 30;
|
|
if (m_seekerElapsed + m_elapsed - m_pauseTime < -100) // -100 to allow small negative value
|
|
m_seekerElapsed = -(m_elapsed - m_pauseTime) - 100;
|
|
} else {
|
|
if (!m_elapsedTimer.isValid())
|
|
m_elapsedTimer.restart();
|
|
else
|
|
m_elapsed = m_elapsedTimer.elapsed();
|
|
}
|
|
m_delta = elapsed() - old;
|
|
advance();
|
|
Q_EMIT advanced();
|
|
}
|
|
|
|
void AnimationDriver::startTimer()
|
|
{
|
|
m_timer.start(m_interval, Qt::PreciseTimer, this);
|
|
}
|
|
|
|
void AnimationDriver::stopTimer()
|
|
{
|
|
m_timer.stop();
|
|
}
|
|
|
|
void AnimationDriver::setSeekerPosition(int position)
|
|
{
|
|
if (!m_seekerEnabled)
|
|
return;
|
|
|
|
if (!m_timer.isActive())
|
|
startTimer();
|
|
|
|
m_seekerPos = position;
|
|
}
|