alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add dpiScale property to dynamically scale the whole ui

Browse Source
This commit is contained in:
Sebastian Kügler 2014-01-22 01:18:54 +01:00
parent 53b4608327
commit 0c3e49866a
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/declarativeimports/plasmacomponents/units.cpp
View File

@ -31,6 +31,11 @@ Units::Units (QObject *parent)
: QObject(parent), : QObject(parent),
m_gridUnit(-1) m_gridUnit(-1)
{ {
//Usual "default" is 96 dpi
//that magic ratio follows the definition of "device independent pixel" by Microsoft
m_dpi = QApplication::desktop()->physicalDpiX();
m_dpiScale = (qreal)m_dpi / (qreal)96;
m_iconSizes = new QQmlPropertyMap(this); m_iconSizes = new QQmlPropertyMap(this);
m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop))); m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
m_iconSizes->insert("panel", QVariant(KIconLoader::global()->currentSize(KIconLoader::Panel))); m_iconSizes->insert("panel", QVariant(KIconLoader::global()->currentSize(KIconLoader::Panel)));
@ -65,10 +70,19 @@ QQmlPropertyMap *Units::iconSizes() const
} }
qreal Units::dpiRatio() const qreal Units::dpiScale() const
{ {
const qreal ratio = (qreal)QApplication::desktop()->physicalDpiX() / (qreal)96;
return ratio; return m_dpiScale;
}
void Units::setDpiScale(const qreal scale)
{
if (m_dpiScale != scale) {
m_dpiScale = scale;
qDebug() << "Setting dpi scale to " << scale;
emit dpiScaleChanged();
}
} }
qreal Units::gridUnit() const qreal Units::gridUnit() const
@ -76,21 +90,18 @@ qreal Units::gridUnit() const
qDebug() << "FontMetrics: " << QApplication::font().pixelSize() << QFontMetrics(QApplication::font()).boundingRect("M"); qDebug() << "FontMetrics: " << QApplication::font().pixelSize() << QFontMetrics(QApplication::font()).boundingRect("M");
qDebug() << " MRect" << QFontMetrics(QApplication::font()).boundingRect("M").size(); qDebug() << " MRect" << QFontMetrics(QApplication::font()).boundingRect("M").size();
qDebug() << " like spacing" << QFontMetrics(QApplication::font()).boundingRect("M").size().height(); qDebug() << " like spacing" << QFontMetrics(QApplication::font()).boundingRect("M").size().height();
qDebug() << "m_dpi: " << m_dpi;
qDebug() << "m_dpiScale: " << m_dpiScale;
const int gridUnit = QFontMetrics(QApplication::font()).boundingRect("M").width(); const int gridUnit = QFontMetrics(QApplication::font()).boundingRect("M").width();
return m_gridUnit; return m_gridUnit;
} }
qreal Units::dp(qreal value) const qreal Units::dp(qreal value) const
{ {
//Usual "default" is 96 dpi
//that magic ratio follows the definition of "device independent pixel" by Microsoft
const qreal ratio = (qreal)QApplication::desktop()->physicalDpiX() / (qreal)96;
if (value <= 2.0) { if (value <= 2.0) {
return qRound(value * floor(ratio)); return qRound(value * floor(m_dpiScale));
} else { } else {
return qRound(value * ratio); return qRound(value * m_dpiScale);
} }
} }

9
src/declarativeimports/plasmacomponents/units.h
View File

@ -46,12 +46,15 @@ class Units : public QObject
*/ */
Q_PROPERTY(QQmlPropertyMap *iconSizes READ iconSizes NOTIFY iconSizesChanged) Q_PROPERTY(QQmlPropertyMap *iconSizes READ iconSizes NOTIFY iconSizesChanged)
Q_PROPERTY(qreal dpiScale READ dpiScale WRITE setDpiScale NOTIFY dpiScaleChanged)
public: public:
Units(QObject *parent = 0); Units(QObject *parent = 0);
~Units(); ~Units();
qreal gridUnit() const; qreal gridUnit() const;
qreal dpiRatio() const;
void setDpiScale(const qreal scale);
qreal dpiScale() const;
QQmlPropertyMap *iconSizes() const; QQmlPropertyMap *iconSizes() const;
@ -67,6 +70,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void dpiScaleChanged();
void gridUnitChanged(); void gridUnitChanged();
void iconSizesChanged(); void iconSizesChanged();
@ -77,7 +81,8 @@ private Q_SLOTS:
private: private:
int m_gridUnit; int m_gridUnit;
Plasma::Theme m_theme; Plasma::Theme m_theme;
qreal m_dpiRatio; qreal m_dpiScale;
qreal m_dpi;
QQmlPropertyMap *m_iconSizes; QQmlPropertyMap *m_iconSizes;
}; };