From 5814e94cffdf8d1afb3c4b2d4ea28125a8c4060f Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 19 Oct 2017 08:44:16 +0200 Subject: [PATCH] combined setting of color/metric animators reverted as also need animators for flags. --- src/controls/QskSkinHintTable.cpp | 20 -------------------- src/controls/QskSkinHintTable.h | 7 +++++++ 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/controls/QskSkinHintTable.cpp b/src/controls/QskSkinHintTable.cpp index cfa934b9..b49acc9a 100644 --- a/src/controls/QskSkinHintTable.cpp +++ b/src/controls/QskSkinHintTable.cpp @@ -94,26 +94,6 @@ const std::unordered_map< QskAspect::Aspect, QVariant >& QskSkinHintTable::hints return dummyHints; } -void QskSkinHintTable::setAnimation( - QskAspect::Aspect aspect, QskAnimationHint animation ) -{ - aspect.setAnimator( true ); - - const QVariant v = QVariant::fromValue( animation ); - - if ( aspect.type() == 0 ) - { - using namespace QskAspect; - - setHint( aspect | Color, v ); - setHint( aspect | Metric, v ); - } - else - { - setHint( aspect, v ); - } -} - void QskSkinHintTable::setHint( QskAspect::Aspect aspect, const QVariant& skinHint ) { if ( m_hints == nullptr ) diff --git a/src/controls/QskSkinHintTable.h b/src/controls/QskSkinHintTable.h index a7f240d6..cc2393cc 100644 --- a/src/controls/QskSkinHintTable.h +++ b/src/controls/QskSkinHintTable.h @@ -243,4 +243,11 @@ inline void QskSkinHintTable::setFlagHint( QskAspect::Aspect aspect, int flag ) setHint( aspect, QVariant( flag ) ); } +inline void QskSkinHintTable::setAnimation( + QskAspect::Aspect aspect, QskAnimationHint animation ) +{ + aspect.setAnimator( true ); + setHint( aspect, QVariant::fromValue( animation ) ); +} + #endif