diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc index 8ab827e44d89fe451337244f8212a0495c366193..f78e603813150497247782ef96097a7dacb186d3 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 219c8b6b45320f97abcf79123d777edd9b00d21c..3aee76f064609dc6d5965d39bd416d9f652cd430 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