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

fix fonts and time display

This commit is contained in:
Peter Hartmann 2020-08-12 15:54:11 +02:00
parent fe968e8c1d
commit 5e14031a16
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/iot-dashboard/DaytimeSkin.cpp
View File

@ -14,8 +14,13 @@ namespace
{ {
static inline QFont qskFont( qreal pointSize, bool semiBold = false ) static inline QFont qskFont( qreal pointSize, bool semiBold = false )
{ {
QString family = semiBold ? "Proxima Nova Lt" : "Proxima Nova"; QFont font("Proxima Nova");
QFont font(family);
if(semiBold)
{
font.setWeight(QFont::Bold);
}
font.setPointSizeF( pointSize /*/ qskDpiScaled( 1.0 )*/ ); font.setPointSizeF( pointSize /*/ qskDpiScaled( 1.0 )*/ );
return font; return font;
} }
@ -32,14 +37,13 @@ void DaytimeSkin::initHints()
{ {
QFontDatabase db; QFontDatabase db;
db.addApplicationFont(":/fonts/ProximaNova-Regular.otf"); // ### use fontconfig db.addApplicationFont(":/fonts/ProximaNova-Regular.otf"); // ### use fontconfig
db.addApplicationFont(":/fonts/ProximaNova-Semibold.otf"); // ### use fontconfig
setFont( QskSkin::DefaultFont, qskFont( 12 ) ); setFont( QskSkin::DefaultFont, qskFont( 12 ) );
setFont( QskSkin::TinyFont, qskFont( 12 ) ); setFont( QskSkin::TinyFont, qskFont( 12 ) );
setFont( QskSkin::SmallFont, qskFont( 10 ) ); setFont( QskSkin::SmallFont, qskFont( 10 ) );
setFont( QskSkin::MediumFont, qskFont( 13 ) ); setFont( QskSkin::MediumFont, qskFont( 13 ) );
setFont( QskSkin::LargeFont, qskFont( 14 ) ); setFont( QskSkin::LargeFont, qskFont( 20 ) );
setFont( QskSkin::HugeFont, qskFont( 36, true ) ); setFont( QskSkin::HugeFont, qskFont( 27, true ) );
QColor color(Qt::white); QColor color(Qt::white);
color.setAlphaF(0.09); color.setAlphaF(0.09);

2
examples/iot-dashboard/TopBar.cpp
View File

@ -59,7 +59,7 @@ TopBar::TopBar(QQuickItem *parent) : QskLinearBox(Qt::Horizontal, parent)
} }
auto* timeControl = new QskLinearBox(Qt::Vertical, this); auto* timeControl = new QskLinearBox(Qt::Vertical, this);
timeControl->setMargins({0, 0, 35, 0}); timeControl->setMargins({0, 0, 50, 0});
auto* timeTitle = new QskTextLabel("Current time", timeControl); // ### make bold or so auto* timeTitle = new QskTextLabel("Current time", timeControl); // ### make bold or so
timeTitle->setFontRole(QskSkin::TinyFont); timeTitle->setFontRole(QskSkin::TinyFont);