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

QskAspect::hasState added

Browse Source
This commit is contained in:
Uwe Rathmann 2020-12-23 09:28:17 +01:00
parent 95d8d2a6da
commit 726aca98df
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/QskAspect.h
View File

@ -154,6 +154,7 @@ class QSK_EXPORT QskAspect
void setState( State ) noexcept; void setState( State ) noexcept;
void addState( State ) noexcept; void addState( State ) noexcept;
constexpr bool hasState() const noexcept;
void clearState( State ) noexcept; void clearState( State ) noexcept;
void clearStates() noexcept; void clearStates() noexcept;
@ -359,6 +360,11 @@ inline void QskAspect::addState( State state ) noexcept
m_bits.states |= state; m_bits.states |= state;
} }
inline constexpr bool QskAspect::hasState() const noexcept
{
return m_bits.states;
}
inline void QskAspect::clearState( State state ) noexcept inline void QskAspect::clearState( State state ) noexcept
{ {
m_bits.states &= ~state; m_bits.states &= ~state;

6
src/controls/QskSkinnable.cpp
View File

@ -609,7 +609,7 @@ bool QskSkinnable::resetSkinHint( QskAspect aspect )
auto a = aspect; auto a = aspect;
a.setPlacement( effectivePlacement() ); a.setPlacement( effectivePlacement() );
if ( a.state() == QskAspect::NoState ) if ( !a.hasState() )
a.setState( skinState() ); a.setState( skinState() );
const auto oldHint = storedHint( a ); const auto oldHint = storedHint( a );
@ -632,7 +632,7 @@ QVariant QskSkinnable::effectiveSkinHint(
if ( v.isValid() ) if ( v.isValid() )
return v; return v;
if ( aspect.state() == QskAspect::NoState ) if ( !aspect.hasState() )
aspect.setState( skinState() ); aspect.setState( skinState() );
return storedHint( aspect, status ); return storedHint( aspect, status );
@ -652,7 +652,7 @@ QVariant QskSkinnable::animatedValue(
{ {
QVariant v; QVariant v;
if ( aspect.state() == QskAspect::NoState ) if ( !aspect.hasState() )
{ {
/* /*
The local animators were invented to be stateless The local animators were invented to be stateless