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

missing status parameter added

Browse Source
This commit is contained in:
Uwe Rathmann 2020-03-18 12:49:57 +01:00
parent ddcb02bd92
commit 0b77a24be0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/controls/QskSkinnable.cpp
View File

@ -296,9 +296,10 @@ void QskSkinnable::setFontRole( QskAspect::Aspect aspect, int role )
m_data->hintTable.setFontRole( aspect, 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 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 ); 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( QskColorFilter QskSkinnable::effectiveGraphicFilter(

4
src/controls/QskSkinnable.h
View File

@ -100,12 +100,12 @@ class QSK_EXPORT QskSkinnable
template< typename T > T flagHint( QskAspect::Aspect, T = T() ) const; template< typename T > T flagHint( QskAspect::Aspect, T = T() ) const;
void setFontRole( QskAspect::Aspect, int role ); void setFontRole( QskAspect::Aspect, int role );
int fontRole( QskAspect::Aspect ) const; int fontRole( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
QFont effectiveFont( QskAspect::Aspect ) const; QFont effectiveFont( QskAspect::Aspect ) const;
void setGraphicRole( QskAspect::Aspect, int role ); void setGraphicRole( QskAspect::Aspect, int role );
int graphicRole( QskAspect::Aspect ) const; int graphicRole( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
QskColorFilter effectiveGraphicFilter( QskAspect::Aspect ) const; QskColorFilter effectiveGraphicFilter( QskAspect::Aspect ) const;