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

QskSkinTransition fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2024-02-01 15:40:16 +01:00
parent 463187d048
commit 330df7308a
4 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/controls/QskSkinTransition.cpp
View File

@ -365,14 +365,29 @@ void WindowAnimator::addHints( const QskControl* control,
if ( v1 && v2 )
{
if ( QskVariantAnimator::maybeInterpolate( *v1, *v2 ) )
if ( r1.section() == r2.section() )
aspect.setSection( r2.section() );
if ( r1.variation() == r2.variation() )
aspect.setVariation( r2.variation() );
if ( r1.states() == r2.states() )
aspect.setStates( r2.states() );
bool accecptIdentity = false;
if ( aspect != aspect.trunk() )
{
if ( r1.variation() == r2.variation() )
aspect.setVariation( r2.variation() );
if ( r1.states() == r2.states() )
aspect.setStates( r2.states() );
/*
We might need an animator even if the values do not differ
to prevent effectiveSkinHint to find its value from
another animator that might have been started with
less extra bits.
*/
accecptIdentity = true;
}
if ( QskVariantAnimator::maybeInterpolate( *v1, *v2, accecptIdentity ) )
{
storeAnimator( control, aspect, *v1, *v2, animatorHint );
storeUpdateInfo( control, aspect );
}

2
src/controls/QskSkinnable.cpp
View File

@ -1316,7 +1316,7 @@ void QskSkinnable::startHintTransition( QskAspect aspect, int index,
if ( control->window() == nullptr || !isTransitionAccepted( aspect ) )
return;
if ( !QskVariantAnimator::maybeInterpolate( from, to ) )
if ( !QskVariantAnimator::maybeInterpolate( from, to, false ) )
return;
auto v1 = from;

50
src/controls/QskVariantAnimator.cpp
View File

@ -210,30 +210,46 @@ void QskVariantAnimator::done()
}
bool QskVariantAnimator::maybeInterpolate(
const QVariant& value1, const QVariant& value2 )
const QVariant& value1, const QVariant& value2, bool acceptIdentity )
{
if ( !value1.isValid() && !value2.isValid() )
return false;
const auto type1 = qskMetaType( value1 );
const auto type2 = qskMetaType( value2 );
if ( !value1.isValid() )
return value2 != qskDefaultVariant( type2 );
if ( !value2.isValid() )
return value1 != qskDefaultVariant( type1 );
if ( type1 != type2 )
if ( acceptIdentity )
{
if ( value1.canConvert( type2 ) )
return value2 != qskConvertedVariant( value1, type2 );
if ( value1.isValid() && value2.isValid() )
{
const auto type1 = qskMetaType( value1 );
const auto type2 = qskMetaType( value2 );
if ( value2.canConvert( type1 ) )
return value1 != qskConvertedVariant( value2, type1 );
if ( type1 != type2 )
return value1.canConvert( type2 ) || value2.canConvert( type1 );
}
return false;
return true;
}
else
{
const auto type1 = qskMetaType( value1 );
const auto type2 = qskMetaType( value2 );
return value1 != value2;
if ( !value1.isValid() )
return value2 != qskDefaultVariant( type2 );
if ( !value2.isValid() )
return value1 != qskDefaultVariant( type1 );
if ( type1 != type2 )
{
if ( value1.canConvert( type2 ) )
return value2 != qskConvertedVariant( value1, type2 );
if ( value2.canConvert( type1 ) )
return value1 != qskConvertedVariant( value2, type1 );
return false;
}
return value1 != value2;
}
}

4
src/controls/QskVariantAnimator.h
View File

@ -24,7 +24,9 @@ class QSK_EXPORT QskVariantAnimator : public QskAnimator
void setEndValue( const QVariant& );
QVariant endValue() const;
static bool maybeInterpolate( const QVariant&, const QVariant& );
static bool maybeInterpolate(
const QVariant&, const QVariant&, bool acceptIdentity );
static bool convertValues( QVariant&, QVariant& );
protected: