From 90388699094046ff3d26e3432c947e8b4abb59ec Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 25 May 2023 14:56:54 +0200 Subject: [PATCH] effectiveFont allows qualified aspects now --- src/controls/QskSkinnable.cpp | 8 ++++---- src/controls/QskSkinnable.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 5b6421b4..beb63889 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -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(); } diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index 2f28091c..91c860b9 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -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 );