force font DPI again, it breaks in qt5 with resolution changes

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>

3 files changed, 9 insertions, 5 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 73daca70..7036e633 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -87,9 +87,9 @@ static void fill_combobox(const QString& filter, QList<DynamicLibrary*>& list, Q
     }
 }
 
-FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WindowFlags flags) :
+FaceTrackNoIR::FaceTrackNoIR(QWidget *parent) :
     __opentrack_version__(OPENTRACK_VERSION),
-    QMainWindow(parent, flags),
+    QMainWindow(parent),
 #if defined(_WIN32)
     keybindingWorker(NULL),
 #else
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index a199635d..6547023b 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -71,7 +71,7 @@ class FaceTrackNoIR : public QMainWindow, IDynamicLibraryProvider
 
 public:
     volatile const char* __opentrack_version__;
-    FaceTrackNoIR(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    FaceTrackNoIR(QWidget *parent = 0);
 	~FaceTrackNoIR();
 
     QFrame *get_video_widget();					// Get a pointer to the video-widget, to use in the DLL
diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp
index 8cc97a38..d7b94506 100644
--- a/facetracknoir/main.cpp
+++ b/facetracknoir/main.cpp
@@ -55,14 +55,18 @@ bool dumpCallback(const wchar_t* dump_path,
 int main(int argc, char** argv)
 {
     QApplication::setAttribute(Qt::AA_X11InitThreads, true);
-	
 #ifdef OPENTRACK_BREAKPAD
 	auto handler = new ExceptionHandler(L".", nullptr, dumpCallback, nullptr, -1);
 #endif
 
     QApplication app(argc, argv);
-
     FaceTrackNoIR w;
+    QFont font;
+    font.setFamily(font.defaultFamily());
+    font.setPointSize(10);
+    font.setPixelSize(10*4/3);
+    w.setFont(font);
+    app.setFont(font);
 	QDesktopWidget desktop;
 
     w.move(desktop.screenGeometry().width()/2-w.width()/2, 100);