From 57382f023035ea8408ef23da5fd273cec9c75500 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 25 Mar 2019 22:39:20 +0100 Subject: [PATCH] Fix font settings in visuals rendered in C++ --- nymea-app/stylecontroller.cpp | 6 ++++++ nymea-app/stylecontroller.h | 2 ++ nymea-app/ui/Nymea.qml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/nymea-app/stylecontroller.cpp b/nymea-app/stylecontroller.cpp index eac65c3d..8e9ce0a1 100644 --- a/nymea-app/stylecontroller.cpp +++ b/nymea-app/stylecontroller.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "stylecontroller.h" @@ -65,3 +66,8 @@ QStringList StyleController::allExperiences() const qDebug() << "experiences:" << dir.entryList(); return QStringList() << "Default" << dir.entryList(); } + +void StyleController::setSystemFont(const QFont &font) +{ + QApplication::setFont(font); +} diff --git a/nymea-app/stylecontroller.h b/nymea-app/stylecontroller.h index 524b59b0..d715205a 100644 --- a/nymea-app/stylecontroller.h +++ b/nymea-app/stylecontroller.h @@ -25,6 +25,8 @@ public: QStringList allExperiences() const; + Q_INVOKABLE void setSystemFont(const QFont &font); + signals: void currentStyleChanged(); void currentExperienceChanged(); diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index d49177ec..e79deeaa 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -47,6 +47,10 @@ ApplicationWindow { property string privacyPolicyUrl: "https://nymea.io/privacy-statement/en/nymea_privacy.html" + Component.onCompleted: { + styleController.setSystemFont(app.font) + } + RootItem { id: rootItem anchors.fill: parent