From 14e844eb842ae38f66e67620605fe45ee60dad49 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 27 Jul 2020 07:26:38 +0200 Subject: [PATCH] making setSkinStata public --- src/controls/QskSkinnable.cpp | 4 ++-- src/controls/QskSkinnable.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 6a0d40f3..379c71a7 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -819,7 +819,7 @@ void QskSkinnable::setSkinStateFlag( QskAspect::State stateFlag, bool on ) setSkinState( newState ); } -void QskSkinnable::setSkinState( QskAspect::State newState ) +void QskSkinnable::setSkinState( QskAspect::State newState, bool animated ) { if ( m_data->skinState == newState ) return; @@ -846,7 +846,7 @@ void QskSkinnable::setSkinState( QskAspect::State newState ) } } - if ( control->window() && isTransitionAccepted( QskAspect::Aspect() ) ) + if ( control->window() && animated && isTransitionAccepted( QskAspect::Aspect() ) ) { const auto placement = effectivePlacement(); diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index fba2d15d..fadd7370 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -153,10 +153,10 @@ class QSK_EXPORT QskSkinnable void debug( QDebug, QskAspect::Aspect ) const; void debug( QDebug, QskAspect::State ) const; - protected: - void setSkinState( QskAspect::State ); - void setSkinStateFlag( QskAspect::State, bool = true ); + void setSkinState( QskAspect::State, bool animated = true ); + void setSkinStateFlag( QskAspect::State, bool on = true ); + protected: virtual void updateNode( QSGNode* ); virtual bool isTransitionAccepted( QskAspect::Aspect ) const;