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

Improve fonts

Browse Source 
Setting the proper weight makes the fonts pixel perfect now
This commit is contained in:
Peter Hartmann 2022-07-06 11:43:49 +02:00
parent f0fbb084f6
commit 2fcc7c77ca
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
skins/material3/QskMaterial3Skin.cpp
View File

@ -12,6 +12,7 @@
#include <QskDialogButton.h> #include <QskDialogButton.h>
#include <QskDialogButtonBox.h> #include <QskDialogButtonBox.h>
#include <QskFocusIndicator.h> #include <QskFocusIndicator.h>
#include <QskFunctions.h>
#include <QskInputPanelBox.h> #include <QskInputPanelBox.h>
#include <QskListView.h> #include <QskListView.h>
#include <QskMenu.h> #include <QskMenu.h>
@ -89,11 +90,16 @@ namespace
const QskMaterial3Theme& m_pal; const QskMaterial3Theme& m_pal;
}; };
QFont createFont( int pixelSize, QFont::Weight weight = QFont::Normal ) QFont createFont( int pixelSize, qreal tracking, QFont::Weight weight )
{ {
QFont font( "Roboto" ); QFont font( "Roboto" );
font.setPixelSize( pixelSize ); font.setPixelSize( pixelSize );
font.setLetterSpacing( QFont::AbsoluteSpacing, 0.1 );
if( !qskFuzzyCompare( tracking, 0.0 ) )
{
font.setLetterSpacing( QFont::AbsoluteSpacing, tracking );
}
font.setWeight( weight ); font.setWeight( weight );
return font; return font;
@ -228,7 +234,7 @@ void Editor::setupMenu()
setStrutSize( Q::Graphic, { 46, -1 } ); setStrutSize( Q::Graphic, { 46, -1 } );
setColor( Q::Text, m_pal.onSurface ); setColor( Q::Text, m_pal.onSurface );
setFontRole( Q::Text, QskMaterial3Skin::M3BodyLarge ); setFontRole( Q::Text, QskMaterial3Skin::M3BodyMedium );
setPosition( Q::Panel, 0 ); setPosition( Q::Panel, 0 );
setPosition( Q::Panel | QskPopup::Closed, 1 ); setPosition( Q::Panel | QskPopup::Closed, 1 );
@ -969,9 +975,10 @@ void QskMaterial3Skin::setupFonts()
{ {
Inherited::setupFonts( QStringLiteral( "Roboto" ) ); Inherited::setupFonts( QStringLiteral( "Roboto" ) );
setFont( M3BodyLarge, createFont( 16 ) ); setFont( M3BodyMedium, createFont( 14, 0.25, QFont::Normal ) );
setFont( M3HeadlineSmall, createFont( 28 ) ); setFont( M3BodyLarge, createFont( 16, 0.5, QFont::Normal ) );
setFont( M3LabelLarge, createFont( 14 ) ); setFont( M3HeadlineSmall, createFont( 28, 0.0, QFont::Normal ) );
setFont( M3LabelLarge, createFont( 14, 0.1, QFont::Medium ) );
} }
#include "moc_QskMaterial3Skin.cpp" #include "moc_QskMaterial3Skin.cpp"

3
skins/material3/QskMaterial3Skin.h
View File

@ -98,7 +98,8 @@ class QSK_MATERIAL3_EXPORT QskMaterial3Skin : public QskSkin
enum FontRole enum FontRole
{ {
M3BodyLarge = QskSkin::HugeFont + 1, M3BodyMedium = QskSkin::HugeFont + 1,
M3BodyLarge,
M3HeadlineSmall, M3HeadlineSmall,
M3LabelLarge, M3LabelLarge,
}; };