effectiveFont allows qualified aspects now
This commit is contained in:
parent
bf74b4edf1
commit
9038869909
@ -708,14 +708,14 @@ int QskSkinnable::fontRoleHint(
|
||||
return qskFlag( this, aspect | QskAspect::FontRole, status );
|
||||
}
|
||||
|
||||
QFont QskSkinnable::effectiveFont( const QskAspect::Subcontrol subControl ) const
|
||||
QFont QskSkinnable::effectiveFont( const QskAspect aspect ) const
|
||||
{
|
||||
return effectiveSkin()->font( fontRoleHint( subControl ) );
|
||||
return effectiveSkin()->font( fontRoleHint( aspect ) );
|
||||
}
|
||||
|
||||
qreal QskSkinnable::effectiveFontHeight( const QskAspect::Subcontrol subControl ) const
|
||||
qreal QskSkinnable::effectiveFontHeight( const QskAspect aspect ) const
|
||||
{
|
||||
const QFontMetricsF fm( effectiveFont( subControl ) );
|
||||
const QFontMetricsF fm( effectiveFont( aspect ) );
|
||||
return fm.height();
|
||||
}
|
||||
|
||||
|
@ -82,8 +82,8 @@ class QSK_EXPORT QskSkinnable
|
||||
void setSkinlet( const QskSkinlet* );
|
||||
const QskSkinlet* skinlet() const;
|
||||
|
||||
QFont effectiveFont( QskAspect::Subcontrol ) const;
|
||||
qreal effectiveFontHeight( QskAspect::Subcontrol ) const;
|
||||
QFont effectiveFont( QskAspect ) const;
|
||||
qreal effectiveFontHeight( QskAspect ) const;
|
||||
QskColorFilter effectiveGraphicFilter( QskAspect::Subcontrol ) const;
|
||||
|
||||
void setSubcontrolProxy( QskAspect::Subcontrol, QskAspect::Subcontrol proxy );
|
||||
|
Loading…
x
Reference in New Issue
Block a user