respecting all local skin hints during skin transitions
This commit is contained in:
parent
2636c4a7af
commit
40aeb80618
@ -257,6 +257,19 @@ namespace
|
||||
// the control is not interested in the aspect
|
||||
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;
|
||||
a.clearStates();
|
||||
@ -275,19 +288,6 @@ namespace
|
||||
// the aspect was resolved to something else
|
||||
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 );
|
||||
storeUpdateInfo( control, candidate.aspect );
|
||||
|
Loading…
x
Reference in New Issue
Block a user