avoid pointless transition when setting the color scheme initially
This commit is contained in:
parent
59d2a484b7
commit
b034f131d5
|
@ -262,7 +262,11 @@ void QskSkin::setColorScheme( ColorScheme colorScheme )
|
|||
|
||||
m_data->colorScheme = colorScheme;
|
||||
|
||||
const auto transitionHint = qskSkinManager->transitionHint();
|
||||
QskAnimationHint transitionHint;
|
||||
|
||||
if ( qskSkinManager->currentSkin() == this )
|
||||
transitionHint = qskSkinManager->transitionHint();
|
||||
|
||||
if ( transitionHint.isValid() )
|
||||
{
|
||||
QskSkinTransition transition;
|
||||
|
|
|
@ -625,6 +625,11 @@ QskSkin* QskSkinManager::skin()
|
|||
return m_data->skin;
|
||||
}
|
||||
|
||||
const QskSkin* QskSkinManager::currentSkin() const
|
||||
{
|
||||
return m_data->skin;
|
||||
}
|
||||
|
||||
void QskSkinManager::setTransitionHint( const QskAnimationHint& hint )
|
||||
{
|
||||
m_data->transitionHint = hint;
|
||||
|
|
|
@ -46,6 +46,8 @@ class QSK_EXPORT QskSkinManager : public QObject
|
|||
void setSkin( QskSkin* );
|
||||
QskSkin* skin();
|
||||
|
||||
const QskSkin* currentSkin() const ;
|
||||
|
||||
QskSkin* setSkin( const QString& );
|
||||
QString skinName() const;
|
||||
|
||||
|
|
Loading…
Reference in New Issue