From 0ed44e458ece196181adfc5ddf6f16e0f361ec9a Mon Sep 17 00:00:00 2001 From: Atul R Date: Wed, 27 Nov 2019 09:48:16 +0100 Subject: [PATCH] Adds fix for Qt bug where Qt fails to recognise a default font. In that case set the default font to Sans serif (#229) --- src/cpp/include/nodegui/Extras/Utils/nutils.h | 1 + src/cpp/lib/Extras/Utils/nutils.cpp | 10 ++++++++++ src/cpp/main.cpp | 1 + 3 files changed, 12 insertions(+) diff --git a/src/cpp/include/nodegui/Extras/Utils/nutils.h b/src/cpp/include/nodegui/Extras/Utils/nutils.h index 9dda6d7b2..f646993b6 100644 --- a/src/cpp/include/nodegui/Extras/Utils/nutils.h +++ b/src/cpp/include/nodegui/Extras/Utils/nutils.h @@ -23,4 +23,5 @@ void safeDelete(QPointer& component) { delete component; } } +void initAppSettings(); } // namespace extrautils diff --git a/src/cpp/lib/Extras/Utils/nutils.cpp b/src/cpp/lib/Extras/Utils/nutils.cpp index 8624a950f..f9efd17b6 100644 --- a/src/cpp/lib/Extras/Utils/nutils.cpp +++ b/src/cpp/lib/Extras/Utils/nutils.cpp @@ -1,5 +1,7 @@ #include "Extras/Utils/nutils.h" +#include +#include #include #include #include @@ -84,4 +86,12 @@ void* extrautils::configureQWidget(QWidget* widget, YGNodeRef node, bool isLeafNode) { flexutils::configureFlexNode(widget, node, isLeafNode); return configureQObject(widget); +} + +void extrautils::initAppSettings() { + QFont f = QApplication::font(); + if (f.defaultFamily().isEmpty()) { + f.setFamily("Sans-Serif"); + QApplication::setFont(f); + } } \ No newline at end of file diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index 041d7f68d..335a158e6 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -35,6 +35,7 @@ #include "core/FlexLayout/flexlayout_wrap.h" // These cant be instantiated in JS Side void InitPrivateHelpers(Napi::Env env) { + extrautils::initAppSettings(); QLayoutWrap::init(env); // Abstact class wrapper for pointing to any layout }