Merge branch 'animset'
This commit is contained in:
commit
0b38a95677
@ -93,7 +93,7 @@ static inline bool qskCheckReceiverThread( const QObject* receiver )
|
||||
return ( thread == QThread::currentThread() );
|
||||
}
|
||||
|
||||
QskHintAnimator::QskHintAnimator()
|
||||
QskHintAnimator::QskHintAnimator() noexcept
|
||||
{
|
||||
}
|
||||
|
||||
@ -101,24 +101,24 @@ QskHintAnimator::~QskHintAnimator()
|
||||
{
|
||||
}
|
||||
|
||||
void QskHintAnimator::setAspect( QskAspect aspect )
|
||||
void QskHintAnimator::setAspect( QskAspect aspect ) noexcept
|
||||
{
|
||||
m_aspect = aspect;
|
||||
}
|
||||
|
||||
void QskHintAnimator::setUpdateFlags( QskAnimationHint::UpdateFlags flags )
|
||||
void QskHintAnimator::setUpdateFlags( QskAnimationHint::UpdateFlags flags ) noexcept
|
||||
{
|
||||
m_updateFlags = flags;
|
||||
}
|
||||
|
||||
void QskHintAnimator::setControl( QskControl* control )
|
||||
void QskHintAnimator::setControl( QskControl* control ) noexcept
|
||||
{
|
||||
m_control = control;
|
||||
}
|
||||
|
||||
void QskHintAnimator::advance( qreal progress )
|
||||
{
|
||||
const QVariant oldValue = currentValue();
|
||||
const auto oldValue = currentValue();
|
||||
|
||||
Inherited::advance( progress );
|
||||
|
||||
|
@ -19,20 +19,22 @@ class QSK_EXPORT QskHintAnimator : public QskVariantAnimator
|
||||
using Inherited = QskVariantAnimator;
|
||||
|
||||
public:
|
||||
QskHintAnimator();
|
||||
QskHintAnimator() noexcept;
|
||||
~QskHintAnimator() override;
|
||||
|
||||
void setAspect( QskAspect );
|
||||
QskAspect aspect() const;
|
||||
void setAspect( QskAspect ) noexcept;
|
||||
QskAspect aspect() const noexcept;
|
||||
|
||||
void setControl( QskControl* );
|
||||
QskControl* control() const;
|
||||
void setControl( QskControl* ) noexcept;
|
||||
QskControl* control() const noexcept;
|
||||
|
||||
void setUpdateFlags( QskAnimationHint::UpdateFlags );
|
||||
QskAnimationHint::UpdateFlags updateFlags() const;
|
||||
void setUpdateFlags( QskAnimationHint::UpdateFlags ) noexcept;
|
||||
QskAnimationHint::UpdateFlags updateFlags() const noexcept;
|
||||
|
||||
void advance( qreal value ) override;
|
||||
|
||||
bool operator<( const QskHintAnimator& ) const noexcept;
|
||||
|
||||
private:
|
||||
QskAspect m_aspect;
|
||||
QskAnimationHint::UpdateFlags m_updateFlags;
|
||||
@ -60,19 +62,24 @@ class QSK_EXPORT QskHintAnimatorTable
|
||||
PrivateData* m_data;
|
||||
};
|
||||
|
||||
inline QskAspect QskHintAnimator::aspect() const
|
||||
inline QskAspect QskHintAnimator::aspect() const noexcept
|
||||
{
|
||||
return m_aspect;
|
||||
}
|
||||
|
||||
inline QskAnimationHint::UpdateFlags QskHintAnimator::updateFlags() const
|
||||
inline QskAnimationHint::UpdateFlags QskHintAnimator::updateFlags() const noexcept
|
||||
{
|
||||
return m_updateFlags;
|
||||
}
|
||||
|
||||
inline QskControl* QskHintAnimator::control() const
|
||||
inline QskControl* QskHintAnimator::control() const noexcept
|
||||
{
|
||||
return m_control;
|
||||
}
|
||||
|
||||
inline bool QskHintAnimator::operator<( const QskHintAnimator& other ) const noexcept
|
||||
{
|
||||
return m_aspect < other.m_aspect;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user