From 53cd7ef3ffde05c19d6171b190d26e7d1a00ed11 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 8 Jun 2017 11:12:37 +0200 Subject: [PATCH] fix(src/components/other/units/Units): provide same font size on mac os --- linphone-desktop/src/components/other/units/Units.cpp | 4 ++++ linphone-desktop/src/components/other/units/Units.hpp | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/linphone-desktop/src/components/other/units/Units.cpp b/linphone-desktop/src/components/other/units/Units.cpp index a9e611583..b8d1e8559 100644 --- a/linphone-desktop/src/components/other/units/Units.cpp +++ b/linphone-desktop/src/components/other/units/Units.cpp @@ -27,5 +27,9 @@ Units::Units (QObject *parent) : QObject(parent) {} float Units::getDp () const { + #ifdef Q_OS_MACOS + return 96.0 / 72.0; + #endif // ifdef Q_OS_MACOS + return 1.0; } diff --git a/linphone-desktop/src/components/other/units/Units.hpp b/linphone-desktop/src/components/other/units/Units.hpp index a6992dd0d..d6bb3fb23 100644 --- a/linphone-desktop/src/components/other/units/Units.hpp +++ b/linphone-desktop/src/components/other/units/Units.hpp @@ -30,15 +30,12 @@ class Units : public QObject { Q_OBJECT; - Q_PROPERTY(float dp READ getDp NOTIFY dpChanged); + Q_PROPERTY(float dp READ getDp CONSTANT); public: Units (QObject *parent = Q_NULLPTR); ~Units () = default; -signals: - void dpChanged (); - private: float getDp () const; };