peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typos fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2017-09-05 12:48:58 +02:00
parent 67df39f599
commit abf9b1763e
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/QskBorderMetrics.h
View File

@ -4,7 +4,7 @@
*****************************************************************************/
#ifndef QSK_BORDER_METRICS_H
#define QSK_BORDER_HINTS_H
#define QSK_BORDER_METRICS_H
#include "QskGlobal.h"
#include "QskMargins.h"

40
src/controls/QskSkinnable.cpp
View File

@ -643,29 +643,22 @@ void QskSkinnable::startTransition( QskAspect::Aspect aspect,
if ( control->window() == nullptr || !control->isInitiallyPainted() )
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;
}
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 )
{
@ -706,6 +699,13 @@ void QskSkinnable::setSkinStateFlag( QskAspect::State state, bool on )
return;
QskControl* control = owningControl();
#if 0
qDebug() << control->className() << ":"
<< skinStateAsPrintable( m_data->skinState ) << "->"
<< skinStateAsPrintable( newState );
#endif
if ( control->window() && control->isInitiallyPainted() )
{
for ( const auto entry : m_data->hintTable.hints() )