default nop implementation for QskSkinTransition::updateSkin

This commit is contained in:
Uwe Rathmann 2017-07-25 21:32:12 +02:00
parent 757479f7f2
commit 3ef6e30857
3 changed files with 7 additions and 14 deletions

View File

@ -392,6 +392,11 @@ QskAnimationHint QskSkinTransition::animation() const
return m_animation; return m_animation;
} }
void QskSkinTransition::updateSkin( QskSkin*, QskSkin* )
{
// nop
}
void QskSkinTransition::process() void QskSkinTransition::process()
{ {
if ( ( m_skins[0] == nullptr ) || ( m_skins[1] == nullptr ) ) if ( ( m_skins[0] == nullptr ) || ( m_skins[1] == nullptr ) )

View File

@ -41,7 +41,7 @@ public:
static QVariant animatedHint( QskAspect::Aspect ); static QVariant animatedHint( QskAspect::Aspect );
protected: protected:
virtual void updateSkin( QskSkin*, QskSkin* ) = 0; virtual void updateSkin( QskSkin*, QskSkin* );
private: private:
QskSkin* m_skins[2]; QskSkin* m_skins[2];

View File

@ -18,18 +18,6 @@
#include <unordered_map> #include <unordered_map>
#include <iostream> #include <iostream>
namespace
{
class SkinTransition : public QskSkinTransition
{
protected:
virtual void updateSkin( QskSkin*, QskSkin* ) override final
{
// nop
}
};
}
SkinnyShortcut::SkinnyShortcut( QObject* parent ): SkinnyShortcut::SkinnyShortcut( QObject* parent ):
QObject( parent ) QObject( parent )
{ {
@ -88,7 +76,7 @@ void SkinnyShortcut::rotateSkin()
QskSkin* newSkin = qskSetup->setSkin( names[ index ] ); QskSkin* newSkin = qskSetup->setSkin( names[ index ] );
SkinTransition transition; QskSkinTransition transition;
//transition.setMask( QskAspect::Color ); // Metrics are flickering -> TODO //transition.setMask( QskAspect::Color ); // Metrics are flickering -> TODO
transition.setSourceSkin( oldSkin ); transition.setSourceSkin( oldSkin );