From 0b77a24be09caa0f15642dc0fd5e2eed4c3e66c0 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 18 Mar 2020 12:49:57 +0100 Subject: [PATCH] missing status parameter added --- src/controls/QskSkinnable.cpp | 10 ++++++---- src/controls/QskSkinnable.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 301ba87d..cc1a5759 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -296,9 +296,10 @@ void QskSkinnable::setFontRole( QskAspect::Aspect aspect, int role ) m_data->hintTable.setFontRole( aspect, role ); } -int QskSkinnable::fontRole( QskAspect::Aspect aspect ) const +int QskSkinnable::fontRole( + QskAspect::Aspect aspect, QskSkinHintStatus* status ) const { - return effectiveHint( aspect | QskAspect::FontRole ).toInt(); + return effectiveHint( aspect | QskAspect::FontRole, status ).toInt(); } QFont QskSkinnable::effectiveFont( QskAspect::Aspect aspect ) const @@ -311,9 +312,10 @@ void QskSkinnable::setGraphicRole( QskAspect::Aspect aspect, int role ) m_data->hintTable.setGraphicRole( aspect, role ); } -int QskSkinnable::graphicRole( QskAspect::Aspect aspect ) const +int QskSkinnable::graphicRole( + QskAspect::Aspect aspect, QskSkinHintStatus* status ) const { - return effectiveHint( aspect | QskAspect::GraphicRole ).toInt(); + return effectiveHint( aspect | QskAspect::GraphicRole, status ).toInt(); } QskColorFilter QskSkinnable::effectiveGraphicFilter( diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index aa9433d6..f7b40145 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -100,12 +100,12 @@ class QSK_EXPORT QskSkinnable template< typename T > T flagHint( QskAspect::Aspect, T = T() ) const; void setFontRole( QskAspect::Aspect, int role ); - int fontRole( QskAspect::Aspect ) const; + int fontRole( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const; QFont effectiveFont( QskAspect::Aspect ) const; void setGraphicRole( QskAspect::Aspect, int role ); - int graphicRole( QskAspect::Aspect ) const; + int graphicRole( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const; QskColorFilter effectiveGraphicFilter( QskAspect::Aspect ) const;