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

missing StrutSize primitive added

Browse Source
This commit is contained in:
Uwe Rathmann 2021-01-21 07:30:32 +01:00
parent 786e6c2446
commit 0ef91c060f
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/controls/QskSkinnable.cpp
View File

@ -182,6 +182,27 @@ static inline void qskTriggerUpdates( QskAspect aspect, QskControl* control )
}
}
static inline QskAspect qskSubstitutedAspect(
const QskSkinnable* skinnable, QskAspect aspect )
{
if ( aspect.hasState() )
{
qWarning() << "QskSkinnable::(re)setSkinHint: setting hints with states "
"is discouraged - use QskSkinTableEditor if you are "
"sure, that you need this.";
qWarning() << "QskAspect:" << aspect.stateless()
<< skinnable->skinStateAsPrintable( aspect.state() );
#if 0
aspect.clearStates();
#endif
}
aspect.setSubControl( skinnable->effectiveSubcontrol( aspect.subControl() ) );
return aspect;
}
class QskSkinnable::PrivateData
{
public:
@ -319,12 +340,12 @@ qreal QskSkinnable::metric( const QskAspect aspect, QskSkinHintStatus* status )
bool QskSkinnable::setStrutSizeHint(
const QskAspect aspect, qreal width, qreal height )
{
return qskSetMetric( this, aspect, QSizeF( width, height ) );
return qskSetMetric( this, aspect | QskAspect::StrutSize, QSizeF( width, height ) );
}
bool QskSkinnable::setStrutSizeHint( const QskAspect aspect, const QSizeF& strut )
{
return qskSetMetric( this, aspect, strut );
return qskSetMetric( this, aspect | QskAspect::StrutSize, strut );
}
bool QskSkinnable::resetStrutSizeHint( const QskAspect aspect )
@ -602,27 +623,6 @@ QskAnimationHint QskSkinnable::effectiveAnimation(
return hint;
}
static inline QskAspect qskSubstitutedAspect(
const QskSkinnable* skinnable, QskAspect aspect )
{
if ( aspect.hasState() )
{
qWarning() << "QskSkinnable::(re)setSkinHint: setting hints with states "
"is discouraged - use QskSkinTableEditor if you are "
"sure, that you need this.";
qWarning() << "QskAspect:" << aspect.stateless()
<< skinnable->skinStateAsPrintable( aspect.state() );
#if 0
aspect.clearStates();
#endif
}
aspect.setSubControl( skinnable->effectiveSubcontrol( aspect.subControl() ) );
return aspect;
}
bool QskSkinnable::setSkinHint( QskAspect aspect, const QVariant& hint )
{
aspect = qskSubstitutedAspect( this, aspect );