From a2d67f0438484618b41bfb1ad21802f04ff95cfd Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Tue, 7 Jun 2022 12:40:21 +0200
Subject: [PATCH] Material: set up fonts

---
 skins/material/QskMaterialSkin.cpp | 36 +++++++++++++++++-------------
 skins/material/QskMaterialSkin.h   |  8 +++++++
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material/QskMaterialSkin.cpp
index e9ffcfc5..74a1bd6d 100644
--- a/skins/material/QskMaterialSkin.cpp
+++ b/skins/material/QskMaterialSkin.cpp
@@ -42,12 +42,6 @@
 #include <QskNamespace.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;
 
 namespace
@@ -94,6 +88,16 @@ namespace
         const QskMaterialTheme& m_pal;
         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()
@@ -425,7 +429,7 @@ void Editor::setupPushButton()
     c2.setAlphaF( 0.38 );
     setColor( Q::Text | Q::Disabled, c2 );
 
-    setFontRole( Q::Text, ButtonFontRole );
+    setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge );
     setAlignment( Q::Text, Qt::AlignCenter );
 
     setGradient( Q::Panel, m_pal.primary );
@@ -463,7 +467,7 @@ void Editor::setupDialogButton()
     c2.setAlphaF( 0.38 );
     setColor( Q::Text | Q::Disabled, c2 );
 
-    setFontRole( Q::Text, ButtonFontRole );
+    setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge );
     setAlignment( Q::Text, Qt::AlignCenter );
 
     for ( auto state1 : { A::NoState, Q::Focused } )
@@ -650,7 +654,7 @@ void Editor::setupTabButton()
 
     setAnimation( Q::Panel | A::Color, qskDuration );
 
-    setFontRole( Q::Text, ButtonFontRole );
+    setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge );
     setAlignment( Q::Text, Qt::AlignCenter );
 }
 
@@ -875,12 +879,7 @@ QskMaterialTheme::QskMaterialTheme( Lightness lightness,
 QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& palette, QObject* parent )
     : Inherited( parent )
 {
-    // Default theme colors
-    setupFonts( QStringLiteral( "Roboto" ) );
-
-    auto buttonFont = font( QskSkin::DefaultFont );
-    buttonFont.setPixelSize( 14 );
-    setFont( ButtonFontRole, buttonFont );
+    setupFonts();
 
     Editor editor( &hintTable(), palette );
     editor.setup();
@@ -890,4 +889,11 @@ QskMaterialSkin::~QskMaterialSkin()
 {
 }
 
+void QskMaterialSkin::setupFonts()
+{
+    Inherited::setupFonts( QStringLiteral( "Roboto" ) );
+
+    setFont( M3LabelLarge, createFont( 14 ) );
+}
+
 #include "moc_QskMaterialSkin.cpp"
diff --git a/skins/material/QskMaterialSkin.h b/skins/material/QskMaterialSkin.h
index f59c12c5..e4bc11f1 100644
--- a/skins/material/QskMaterialSkin.h
+++ b/skins/material/QskMaterialSkin.h
@@ -82,7 +82,15 @@ class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin
     QskMaterialSkin( const QskMaterialTheme&, QObject* parent = nullptr );
     ~QskMaterialSkin() override;
 
+    enum FontRole
+    {
+        M3LabelLarge = QskSkin::HugeFont + 1,
+    };
+
     // ### add setTheme() re-implement resetColors()
+
+  private:
+    void setupFonts();
 };
 
 #endif