use tiny font
This commit is contained in:
parent
dfac8e1af3
commit
f849acaef9
|
@ -14,11 +14,11 @@ namespace
|
||||||
{
|
{
|
||||||
static inline QFont qskFont( qreal pointSize, bool semiBold = false )
|
static inline QFont qskFont( qreal pointSize, bool semiBold = false )
|
||||||
{
|
{
|
||||||
QFont font("Proxima Nova");
|
QFont font( "Proxima Nova" );
|
||||||
|
|
||||||
if(semiBold)
|
if( semiBold )
|
||||||
{
|
{
|
||||||
font.setWeight(QFont::Bold);
|
font.setWeight( QFont::Bold );
|
||||||
}
|
}
|
||||||
|
|
||||||
font.setPointSizeF( pointSize /*/ qskDpiScaled( 1.0 )*/ );
|
font.setPointSizeF( pointSize /*/ qskDpiScaled( 1.0 )*/ );
|
||||||
|
@ -36,19 +36,19 @@ DaytimeSkin::DaytimeSkin( QObject* parent ) : QskSkin( parent )
|
||||||
void DaytimeSkin::initHints()
|
void DaytimeSkin::initHints()
|
||||||
{
|
{
|
||||||
QFontDatabase db;
|
QFontDatabase db;
|
||||||
db.addApplicationFont(":/fonts/ProximaNova-Regular.otf"); // ### use fontconfig
|
db.addApplicationFont( ":/fonts/ProximaNova-Regular.otf" ); // ### use fontconfig
|
||||||
|
|
||||||
setFont( QskSkin::DefaultFont, qskFont( 12 ) );
|
setFont( QskSkin::DefaultFont, qskFont( 12 ) );
|
||||||
setFont( QskSkin::TinyFont, qskFont( 12 ) );
|
setFont( QskSkin::TinyFont, qskFont( 9 ) );
|
||||||
setFont( QskSkin::SmallFont, qskFont( 10 ) );
|
setFont( QskSkin::SmallFont, qskFont( 10 ) );
|
||||||
setFont( QskSkin::MediumFont, qskFont( 13 ) );
|
setFont( QskSkin::MediumFont, qskFont( 13 ) );
|
||||||
setFont( QskSkin::LargeFont, qskFont( 20 ) );
|
setFont( QskSkin::LargeFont, qskFont( 20 ) );
|
||||||
setFont( QskSkin::HugeFont, qskFont( 27, true ) );
|
setFont( QskSkin::HugeFont, qskFont( 27, true ) );
|
||||||
|
|
||||||
setFont( DaytimeSkin::TitleFont, qskFont(10, true));
|
setFont( DaytimeSkin::TitleFont, qskFont( 10, true ) );
|
||||||
|
|
||||||
QColor color(Qt::white);
|
QColor color( Qt::white );
|
||||||
color.setAlphaF(0.09);
|
color.setAlphaF( 0.09 );
|
||||||
setGradient( MenuItem::Panel | QskControl::Hovered, color );
|
setGradient( MenuItem::Panel | QskControl::Hovered, color );
|
||||||
|
|
||||||
setBoxBorderMetrics( PieChart::Panel, 2 );
|
setBoxBorderMetrics( PieChart::Panel, 2 );
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace
|
||||||
box->setGradientHint( QskBox::Panel, color );
|
box->setGradientHint( QskBox::Panel, color );
|
||||||
|
|
||||||
auto* textLabel = new QskTextLabel( text, this );
|
auto* textLabel = new QskTextLabel( text, this );
|
||||||
textLabel->setFontRole( QskSkin::SmallFont );
|
textLabel->setFontRole( QskSkin::TinyFont );
|
||||||
|
|
||||||
qreal h = textLabel->preferredSize().height();
|
qreal h = textLabel->preferredSize().height();
|
||||||
box->setPreferredSize( h, h );
|
box->setPreferredSize( h, h );
|
||||||
|
|
Loading…
Reference in New Issue