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

animatedValue fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2019-04-19 17:04:36 +02:00
parent d03779cc6d
commit 925613b81c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/controls/QskSkinnable.cpp
View File

@ -395,8 +395,7 @@ QskAnimationHint QskSkinnable::effectiveAnimation(
return hint;
}
const QskSkin* skin = effectiveSkin();
if ( skin )
if ( auto skin = effectiveSkin() )
{
const auto a = skin->hintTable().resolvedAnimator( aspect, hint );
if ( a.isAnimator() )
@ -485,13 +484,24 @@ QVariant QskSkinnable::animatedValue(
if ( aspect.state() == QskAspect::NoState )
aspect = aspect | skinState();
const auto aspect0 = aspect;
Q_FOREVER
{
v = QskSkinTransition::animatedHint( control->window(), aspect );
if ( v.isValid() || aspect.state() == QskAspect::NoState )
Q_FOREVER
{
v = QskSkinTransition::animatedHint( control->window(), aspect );
if ( v.isValid() || aspect.state() == QskAspect::NoState )
break;
aspect.clearState( aspect.topState() );
}
if ( v.isValid() || aspect.placement() == QskAspect::NoPlacement )
break;
aspect.clearState( aspect.topState() );
aspect = aspect0;
aspect.setPlacement( QskAspect::NoPlacement );
}
}
}