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

effectiveFont allows qualified aspects now

Browse Source
This commit is contained in:
Uwe Rathmann 2023-05-25 14:56:54 +02:00
parent bf74b4edf1
commit 9038869909
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/controls/QskSkinnable.cpp
View File

@ -708,14 +708,14 @@ int QskSkinnable::fontRoleHint(
return qskFlag( this, aspect | QskAspect::FontRole, status ); 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(); return fm.height();
} }

4
src/controls/QskSkinnable.h
View File

@ -82,8 +82,8 @@ class QSK_EXPORT QskSkinnable
void setSkinlet( const QskSkinlet* ); void setSkinlet( const QskSkinlet* );
const QskSkinlet* skinlet() const; const QskSkinlet* skinlet() const;
QFont effectiveFont( QskAspect::Subcontrol ) const; QFont effectiveFont( QskAspect ) const;
qreal effectiveFontHeight( QskAspect::Subcontrol ) const; qreal effectiveFontHeight( QskAspect ) const;
QskColorFilter effectiveGraphicFilter( QskAspect::Subcontrol ) const; QskColorFilter effectiveGraphicFilter( QskAspect::Subcontrol ) const;
void setSubcontrolProxy( QskAspect::Subcontrol, QskAspect::Subcontrol proxy ); void setSubcontrolProxy( QskAspect::Subcontrol, QskAspect::Subcontrol proxy );