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

respecting all local skin hints during skin transitions

Browse Source
This commit is contained in:
Uwe Rathmann 2017-07-26 13:21:44 +02:00
parent 2636c4a7af
commit 40aeb80618
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/controls/QskSkinTransition.cpp
View File

@ -257,6 +257,19 @@ namespace
// the control is not interested in the aspect // the control is not interested in the aspect
continue; continue;
} }
}
else
{
if ( !control->autoFillBackground() )
{
if ( candidate.aspect.isBoxPrimitive() &&
( candidate.aspect.boxPrimitive() == QskAspect::Background ) )
{
// no need to animate the background unless we show it
continue;
}
}
}
QskAspect::Aspect a = candidate.aspect; QskAspect::Aspect a = candidate.aspect;
a.clearStates(); a.clearStates();
@ -275,19 +288,6 @@ namespace
// the aspect was resolved to something else // the aspect was resolved to something else
continue; continue;
} }
}
else
{
if ( !control->autoFillBackground() )
{
if ( candidate.aspect.isBoxPrimitive() &&
( candidate.aspect.boxPrimitive() == QskAspect::Background ) )
{
// no need to animate the background if we show it
continue;
}
}
}
addAnimator( control, candidate, animatorHint ); addAnimator( control, candidate, animatorHint );
storeUpdateInfo( control, candidate.aspect ); storeUpdateInfo( control, candidate.aspect );