typos fixed
This commit is contained in:
parent
67df39f599
commit
abf9b1763e
@ -4,7 +4,7 @@
|
|||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#ifndef QSK_BORDER_METRICS_H
|
#ifndef QSK_BORDER_METRICS_H
|
||||||
#define QSK_BORDER_HINTS_H
|
#define QSK_BORDER_METRICS_H
|
||||||
|
|
||||||
#include "QskGlobal.h"
|
#include "QskGlobal.h"
|
||||||
#include "QskMargins.h"
|
#include "QskMargins.h"
|
||||||
|
@ -643,29 +643,22 @@ void QskSkinnable::startTransition( QskAspect::Aspect aspect,
|
|||||||
if ( control->window() == nullptr || !control->isInitiallyPainted() )
|
if ( control->window() == nullptr || !control->isInitiallyPainted() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ( from == to )
|
// We might be invalid for one of the values, when an aspect
|
||||||
|
// has not been defined for all states ( f.e. metrics are expected
|
||||||
|
// to fallback to 0.0 ). In this case we create a default one.
|
||||||
|
|
||||||
|
if ( !from.isValid() )
|
||||||
|
{
|
||||||
|
from = QVariant( to.type() );
|
||||||
|
}
|
||||||
|
else if ( !to.isValid() )
|
||||||
|
{
|
||||||
|
to = QVariant( from.type() );
|
||||||
|
}
|
||||||
|
else if ( from.type() != to.type() )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// We might be invalid for one of the values, when an aspect
|
|
||||||
// has not been defined for all states ( f.e. metrics are expected
|
|
||||||
// to fallback to 0.0 ). In this case we create a default one.
|
|
||||||
|
|
||||||
if ( !from.isValid() )
|
|
||||||
{
|
|
||||||
from = QVariant( to.type() );
|
|
||||||
}
|
|
||||||
else if ( !to.isValid() )
|
|
||||||
{
|
|
||||||
to = QVariant( from.type() );
|
|
||||||
}
|
|
||||||
else if ( from.type() != to.type() )
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( aspect.flagPrimitive() == QskAspect::GraphicRole )
|
if( aspect.flagPrimitive() == QskAspect::GraphicRole )
|
||||||
{
|
{
|
||||||
@ -706,6 +699,13 @@ void QskSkinnable::setSkinStateFlag( QskAspect::State state, bool on )
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
QskControl* control = owningControl();
|
QskControl* control = owningControl();
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
qDebug() << control->className() << ":"
|
||||||
|
<< skinStateAsPrintable( m_data->skinState ) << "->"
|
||||||
|
<< skinStateAsPrintable( newState );
|
||||||
|
#endif
|
||||||
|
|
||||||
if ( control->window() && control->isInitiallyPainted() )
|
if ( control->window() && control->isInitiallyPainted() )
|
||||||
{
|
{
|
||||||
for ( const auto entry : m_data->hintTable.hints() )
|
for ( const auto entry : m_data->hintTable.hints() )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user