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

effectiveHint -> effectiveSkinHint

This commit is contained in:
Uwe Rathmann 2020-12-21 10:24:59 +01:00
parent bdc068c4d6
commit 812f108e21
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controls/QskPopup.cpp
View File

@ -213,7 +213,7 @@ bool QskPopup::isFading() const
return false;
QskSkinHintStatus status;
(void) effectiveHint( m_data->faderAspect, &status );
(void) effectiveSkinHint( m_data->faderAspect, &status );
return status.source == QskSkinHintStatus::Animator;
}

19
src/controls/QskSkinnable.cpp
View File

@ -120,7 +120,7 @@ static inline void qskSetFlag( QskSkinnable* skinnable,
static inline int qskFlag( const QskSkinnable* skinnable,
const QskAspect::Aspect aspect, QskSkinHintStatus* status = nullptr )
{
return skinnable->effectiveHint( aspect | QskAspect::Flag, status ).toInt();
return skinnable->effectiveSkinHint( aspect | QskAspect::Flag, status ).toInt();
}
static inline void qskSetMetric( QskSkinnable* skinnable,
@ -140,7 +140,7 @@ template< typename T >
static inline T qskMetric( const QskSkinnable* skinnable,
QskAspect::Aspect aspect, QskSkinHintStatus* status = nullptr )
{
return skinnable->effectiveHint(
return skinnable->effectiveSkinHint(
aspect | QskAspect::Metric, status ).value< T >();
}
@ -161,7 +161,7 @@ template< typename T >
static inline T qskColor( const QskSkinnable* skinnable,
QskAspect::Aspect aspect, QskSkinHintStatus* status = nullptr )
{
return skinnable->effectiveHint(
return skinnable->effectiveSkinHint(
aspect | QskAspect::Color, status ).value< T >();
}
@ -256,7 +256,7 @@ void QskSkinnable::setFlagHint( QskAspect::Aspect aspect, int flag )
int QskSkinnable::flagHint( QskAspect::Aspect aspect ) const
{
return effectiveHint( aspect ).toInt();
return effectiveSkinHint( aspect ).toInt();
}
void QskSkinnable::setAlignmentHint( QskAspect::Aspect aspect, Qt::Alignment alignment )
@ -401,8 +401,7 @@ void QskSkinnable::setBoxBorderMetricsHint(
bool QskSkinnable::resetBoxBorderMetricsHint( QskAspect::Aspect aspect )
{
const auto asp = aspect | QskAspect::Metric | QskAspect::Border;
return resetHint( asp );
return resetMetric( aspect | QskAspect::Border );
}
QskBoxBorderMetrics QskSkinnable::boxBorderMetricsHint(
@ -540,7 +539,7 @@ QskAnimationHint QskSkinnable::animationHint(
QskAspect::Aspect aspect, QskSkinHintStatus* status ) const
{
aspect.setAnimator( true );
return effectiveHint( aspect, status ).value< QskAnimationHint >();
return effectiveSkinHint( aspect, status ).value< QskAnimationHint >();
}
QskAnimationHint QskSkinnable::effectiveAnimation(
@ -594,7 +593,7 @@ void QskSkinnable::setSkinHint( QskAspect::Aspect aspect, const QVariant& skinHi
m_data->hintTable.setHint( aspect, skinHint );
}
bool QskSkinnable::resetHint( QskAspect::Aspect aspect )
bool QskSkinnable::resetSkinHint( QskAspect::Aspect aspect )
{
aspect.setSubControl( effectiveSubcontrol( aspect.subControl() ) );
@ -622,7 +621,7 @@ bool QskSkinnable::resetHint( QskAspect::Aspect aspect )
return oldHint != storedHint( a );
}
QVariant QskSkinnable::effectiveHint(
QVariant QskSkinnable::effectiveSkinHint(
QskAspect::Aspect aspect, QskSkinHintStatus* status ) const
{
aspect.setSubControl( effectiveSubcontrol( aspect.subControl() ) );
@ -645,7 +644,7 @@ QskSkinHintStatus QskSkinnable::hintStatus( QskAspect::Aspect aspect ) const
{
QskSkinHintStatus status;
( void ) effectiveHint( aspect, &status );
( void ) effectiveSkinHint( aspect, &status );
return status;
}

12
src/controls/QskSkinnable.h
View File

@ -147,12 +147,12 @@ class QSK_EXPORT QskSkinnable
QskAnimationHint animationHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
void setSkinHint( QskAspect::Aspect, const QVariant& );
bool resetHint( QskAspect::Aspect );
bool resetSkinHint( QskAspect::Aspect );
QskAnimationHint effectiveAnimation( QskAspect::Type, QskAspect::Subcontrol,
QskAspect::State, QskSkinHintStatus* status = nullptr ) const;
QVariant effectiveHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
QVariant effectiveSkinHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
virtual QskAspect::Placement effectivePlacement() const;
QskSkinHintStatus hintStatus( QskAspect::Aspect ) const;
@ -209,7 +209,7 @@ class QSK_EXPORT QskSkinnable
template< typename T >
inline T QskSkinnable::flagHint( QskAspect::Aspect aspect, T defaultValue ) const
{
const auto& hint = effectiveHint( aspect );
const auto& hint = effectiveSkinHint( aspect );
if ( hint.isValid() && hint.canConvert< int >() )
return static_cast< T >( hint.value< int >() );
@ -224,17 +224,17 @@ inline Qt::Alignment QskSkinnable::alignmentHint(
inline bool QskSkinnable::resetColor( QskAspect::Aspect aspect )
{
return resetHint( aspect | QskAspect::Color );
return resetSkinHint( aspect | QskAspect::Color );
}
inline bool QskSkinnable::resetMetric( QskAspect::Aspect aspect )
{
return resetHint( aspect | QskAspect::Metric );
return resetSkinHint( aspect | QskAspect::Metric );
}
inline bool QskSkinnable::resetFlagHint( QskAspect::Aspect aspect )
{
return resetHint( aspect | QskAspect::Flag );
return resetSkinHint( aspect | QskAspect::Flag );
}
#endif