Commit 5c610f97 authored by Don Gagne's avatar Don Gagne

Added medium and large default font sizes

parent fb473fe7
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include <QFontMetrics> #include <QFontMetrics>
const double ScreenTools::_defaultFontPointSize = 13; const double ScreenTools::_defaultFontPointSize = 13;
const double ScreenTools::_mediumFontPointSize = 16;
const double ScreenTools::_largeFontPointSize = 20;
ScreenTools::ScreenTools() ScreenTools::ScreenTools()
{ {
...@@ -92,7 +94,7 @@ void ScreenTools::_updatePixelSize() ...@@ -92,7 +94,7 @@ void ScreenTools::_updatePixelSize()
void ScreenTools::_updateFontSize() void ScreenTools::_updateFontSize()
{ {
emit fontPointFactorChanged(); emit fontPointFactorChanged();
emit defaultFontPointSizeChanged(); emit fontSizesChanged();
} }
double ScreenTools::fontPointFactor() double ScreenTools::fontPointFactor()
...@@ -109,3 +111,13 @@ double ScreenTools::defaultFontPointSize(void) ...@@ -109,3 +111,13 @@ double ScreenTools::defaultFontPointSize(void)
{ {
return _defaultFontPointSize * MainWindow::fontPointFactor(); return _defaultFontPointSize * MainWindow::fontPointFactor();
} }
double ScreenTools::mediumFontPointSize(void)
{
return _mediumFontPointSize * MainWindow::fontPointFactor();
}
double ScreenTools::largeFontPointSize(void)
{
return _largeFontPointSize * MainWindow::fontPointFactor();
}
...@@ -85,8 +85,13 @@ public: ...@@ -85,8 +85,13 @@ public:
Q_PROPERTY(double fontPointFactor READ fontPointFactor NOTIFY fontPointFactorChanged) Q_PROPERTY(double fontPointFactor READ fontPointFactor NOTIFY fontPointFactorChanged)
//! Returns the pixel size factor //! Returns the pixel size factor
Q_PROPERTY(double pixelSizeFactor READ pixelSizeFactor NOTIFY pixelSizeFactorChanged) Q_PROPERTY(double pixelSizeFactor READ pixelSizeFactor NOTIFY pixelSizeFactorChanged)
//! Returns the system wide default font point size (properly scaled) //! Returns the system wide default font point size (properly scaled)
Q_PROPERTY(double defaultFontPointSize READ defaultFontPointSize NOTIFY defaultFontPointSizeChanged) Q_PROPERTY(double defaultFontPointSize READ defaultFontPointSize NOTIFY fontSizesChanged)
//! Returns the system wide default font point size (properly scaled)
Q_PROPERTY(double mediumFontPointSize READ mediumFontPointSize NOTIFY fontSizesChanged)
//! Returns the system wide default font point size (properly scaled)
Q_PROPERTY(double largeFontPointSize READ largeFontPointSize NOTIFY fontSizesChanged)
//! Utility for adjusting font point size. Not dynamic (no signals) //! Utility for adjusting font point size. Not dynamic (no signals)
Q_INVOKABLE qreal adjustFontPointSize(qreal pointSize); Q_INVOKABLE qreal adjustFontPointSize(qreal pointSize);
...@@ -113,6 +118,8 @@ public: ...@@ -113,6 +118,8 @@ public:
double fontPointFactor (); double fontPointFactor ();
double pixelSizeFactor (); double pixelSizeFactor ();
double defaultFontPointSize(void); double defaultFontPointSize(void);
double mediumFontPointSize(void);
double largeFontPointSize(void);
#if defined (__android__) #if defined (__android__)
bool isAndroid () { return true; } bool isAndroid () { return true; }
...@@ -128,7 +135,7 @@ signals: ...@@ -128,7 +135,7 @@ signals:
void repaintRequestedChanged(); void repaintRequestedChanged();
void pixelSizeFactorChanged(); void pixelSizeFactorChanged();
void fontPointFactorChanged(); void fontPointFactorChanged();
void defaultFontPointSizeChanged(); void fontSizesChanged();
private slots: private slots:
void _updateCanvas(); void _updateCanvas();
...@@ -137,7 +144,8 @@ private slots: ...@@ -137,7 +144,8 @@ private slots:
private: private:
static const double _defaultFontPointSize; static const double _defaultFontPointSize;
static const double _mediumFontPointSize;
static const double _largeFontPointSize;
}; };
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment