peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making startTransition aware of sunControl redirection

Browse Source
This commit is contained in:
Uwe Rathmann 2020-12-21 15:27:05 +01:00
parent 812f108e21
commit 0df922cba8
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controls/QskSkinnable.cpp
View File

@ -931,6 +931,13 @@ bool QskSkinnable::isTransitionAccepted( QskAspect::Aspect aspect ) const
void QskSkinnable::startTransition( QskAspect::Aspect aspect, void QskSkinnable::startTransition( QskAspect::Aspect aspect,
QskAnimationHint animationHint, QVariant from, QVariant to ) QskAnimationHint animationHint, QVariant from, QVariant to )
{
aspect.setSubControl( effectiveSubcontrol( aspect.subControl() ) );
startHintTransition( aspect, animationHint, from, to );
}
void QskSkinnable::startHintTransition( QskAspect::Aspect aspect,
QskAnimationHint animationHint, QVariant from, QVariant to )
{ {
if ( animationHint.duration <= 0 || ( from == to ) ) if ( animationHint.duration <= 0 || ( from == to ) )
return; return;

3
src/controls/QskSkinnable.h
View File

@ -199,6 +199,9 @@ class QSK_EXPORT QskSkinnable
const QskSkinHintTable& hintTable() const; const QskSkinHintTable& hintTable() const;
private: private:
void startHintTransition( QskAspect::Aspect,
QskAnimationHint, QVariant from, QVariant to );
QVariant animatedValue( QskAspect::Aspect, QskSkinHintStatus* ) const; QVariant animatedValue( QskAspect::Aspect, QskSkinHintStatus* ) const;
const QVariant& storedHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const; const QVariant& storedHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;

4
src/controls/QskSlider.cpp
View File

@ -255,10 +255,6 @@ void QskSlider::moveHandleTo( qreal value, const QskAnimationHint& hint )
const qreal oldPos = metric( aspect ); const qreal oldPos = metric( aspect );
setMetric( aspect, pos ); setMetric( aspect, pos );
#if 1
// startTransition should do this: TODO ...
aspect.setSubControl( effectiveSubcontrol( Handle ) );
#endif
startTransition( aspect, hint, oldPos, pos ); startTransition( aspect, hint, oldPos, pos );
} }
else else