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

Material: set up fonts

Browse Source
This commit is contained in:
Peter Hartmann 2022-06-07 12:40:21 +02:00
parent 1839cd452f
commit a2d67f0438
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
skins/material/QskMaterialSkin.cpp
View File

@ -42,12 +42,6 @@
#include <QskNamespace.h> #include <QskNamespace.h>
#include <QskPlatform.h> #include <QskPlatform.h>
#if 1
// should be defined in the public header, so that
// application code can avoid conflicts
static const int ButtonFontRole = QskSkin::HugeFont + 77;
#endif
static const int qskDuration = 150; static const int qskDuration = 150;
namespace namespace
@ -94,6 +88,16 @@ namespace
const QskMaterialTheme& m_pal; const QskMaterialTheme& m_pal;
const uint rippleSize = 40; // ### remove const uint rippleSize = 40; // ### remove
}; };
QFont createFont( int pixelSize, QFont::Weight weight = QFont::Normal )
{
QFont font( "Roboto" );
font.setPixelSize( pixelSize );
font.setLetterSpacing( QFont::AbsoluteSpacing, 0.1 );
font.setWeight( weight );
return font;
}
} }
void Editor::setup() void Editor::setup()
@ -425,7 +429,7 @@ void Editor::setupPushButton()
c2.setAlphaF( 0.38 ); c2.setAlphaF( 0.38 );
setColor( Q::Text | Q::Disabled, c2 ); setColor( Q::Text | Q::Disabled, c2 );
setFontRole( Q::Text, ButtonFontRole ); setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge );
setAlignment( Q::Text, Qt::AlignCenter ); setAlignment( Q::Text, Qt::AlignCenter );
setGradient( Q::Panel, m_pal.primary ); setGradient( Q::Panel, m_pal.primary );
@ -463,7 +467,7 @@ void Editor::setupDialogButton()
c2.setAlphaF( 0.38 ); c2.setAlphaF( 0.38 );
setColor( Q::Text | Q::Disabled, c2 ); setColor( Q::Text | Q::Disabled, c2 );
setFontRole( Q::Text, ButtonFontRole ); setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge );
setAlignment( Q::Text, Qt::AlignCenter ); setAlignment( Q::Text, Qt::AlignCenter );
for ( auto state1 : { A::NoState, Q::Focused } ) for ( auto state1 : { A::NoState, Q::Focused } )
@ -650,7 +654,7 @@ void Editor::setupTabButton()
setAnimation( Q::Panel | A::Color, qskDuration ); setAnimation( Q::Panel | A::Color, qskDuration );
setFontRole( Q::Text, ButtonFontRole ); setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge );
setAlignment( Q::Text, Qt::AlignCenter ); setAlignment( Q::Text, Qt::AlignCenter );
} }
@ -875,12 +879,7 @@ QskMaterialTheme::QskMaterialTheme( Lightness lightness,
QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& palette, QObject* parent ) QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& palette, QObject* parent )
: Inherited( parent ) : Inherited( parent )
{ {
// Default theme colors setupFonts();
setupFonts( QStringLiteral( "Roboto" ) );
auto buttonFont = font( QskSkin::DefaultFont );
buttonFont.setPixelSize( 14 );
setFont( ButtonFontRole, buttonFont );
Editor editor( &hintTable(), palette ); Editor editor( &hintTable(), palette );
editor.setup(); editor.setup();
@ -890,4 +889,11 @@ QskMaterialSkin::~QskMaterialSkin()
{ {
} }
void QskMaterialSkin::setupFonts()
{
Inherited::setupFonts( QStringLiteral( "Roboto" ) );
setFont( M3LabelLarge, createFont( 14 ) );
}
#include "moc_QskMaterialSkin.cpp" #include "moc_QskMaterialSkin.cpp"

8
skins/material/QskMaterialSkin.h
View File

@ -82,7 +82,15 @@ class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin
QskMaterialSkin( const QskMaterialTheme&, QObject* parent = nullptr ); QskMaterialSkin( const QskMaterialTheme&, QObject* parent = nullptr );
~QskMaterialSkin() override; ~QskMaterialSkin() override;
enum FontRole
{
M3LabelLarge = QskSkin::HugeFont + 1,
};
// ### add setTheme() re-implement resetColors() // ### add setTheme() re-implement resetColors()
private:
void setupFonts();
}; };
#endif #endif