From ff56426e0312e4bbf1df12f0b05f4cc1da12e265 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 1 Apr 2015 14:22:15 -0700 Subject: [PATCH] Add dpi adjusted font sizes --- src/QGCPalette.cc | 8 ++++++++ src/QGCPalette.h | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc index 8ab827e44..f78e60381 100644 --- a/src/QGCPalette.cc +++ b/src/QGCPalette.cc @@ -25,10 +25,13 @@ /// @author Don Gagne #include "QGCPalette.h" +#include "ScreenTools.h" #include #include +const qreal QGCPalette::_defaultFontPointSize = 12; + QList QGCPalette::_paletteObjects; QGCPalette::Theme QGCPalette::_theme = QGCPalette::Dark; @@ -130,3 +133,8 @@ void QGCPalette::_themeChanged(void) { emit paletteChanged(); } + +qreal QGCPalette::dpiAdjustedDefaultFontPointSize(void) +{ + return ScreenTools::dpiAdjustedPointSize_s(_defaultFontPointSize); +} diff --git a/src/QGCPalette.h b/src/QGCPalette.h index 219c8b6b4..3aee76f06 100644 --- a/src/QGCPalette.h +++ b/src/QGCPalette.h @@ -82,7 +82,11 @@ class QGCPalette : public QObject // Text color for TextFields Q_PROPERTY(QColor textFieldText READ textFieldText NOTIFY paletteChanged) - + + Q_PROPERTY(qreal defaultFontPointSize MEMBER _defaultFontPointSize CONSTANT) + + Q_PROPERTY(qreal dpiAdjustedDefaultFontPointSize READ dpiAdjustedDefaultFontPointSize CONSTANT) + public: enum ColorGroup { Disabled = 0, @@ -120,6 +124,8 @@ public: static Theme globalTheme(void) { return _theme; } static void setGlobalTheme(Theme newTheme); + qreal dpiAdjustedDefaultFontPointSize(void); + signals: void paletteChanged(void); @@ -149,6 +155,8 @@ private: static QColor _textField[_cThemes][_cColorGroups]; static QColor _textFieldText[_cThemes][_cColorGroups]; + static const qreal _defaultFontPointSize; + void _themeChanged(void); static QList _paletteObjects; ///< List of all active QGCPalette objects -- 2.22.0