summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-10-26 21:10:51 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-10-27 01:05:52 +0200
commit881bd1ae68eb11ae5621789be7aee6677bf4f447 (patch)
tree35ca30438a38bc76c9e8bfd668140904d42c8212
parent12f74077aa7099c87aed623a241619893a6bf304 (diff)
force font DPI again, it breaks in qt5 with resolution changes
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
-rw-r--r--facetracknoir/facetracknoir.cpp4
-rw-r--r--facetracknoir/facetracknoir.h2
-rw-r--r--facetracknoir/main.cpp8
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);