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

Use int for units.gridUnit

Browse Source 
It was an int already anyway, so let's be true about this and also
return an int. This reflects pixel-alignment in the API, not just in the
implementation.
This commit is contained in:
Sebastian Kügler 2014-01-24 12:33:39 +01:00
parent 2a3a546f80
commit 6d9022dca2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/declarativeimports/core/units.cpp
View File

@ -96,7 +96,7 @@ void Units::setDevicePixelRatio(const qreal scale)
} }
} }
qreal Units::gridUnit() const int 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();

4
src/declarativeimports/core/units.h
View File

@ -35,7 +35,7 @@ class Units : public QObject
* The fundamental unit of space that should be used for sizes, expressed in pixels. * The fundamental unit of space that should be used for sizes, expressed in pixels.
* Given the screen has an accurate DPI settings, it corresponds to a millimeter * Given the screen has an accurate DPI settings, it corresponds to a millimeter
*/ */
Q_PROPERTY(qreal gridUnit READ gridUnit NOTIFY gridUnitChanged()) Q_PROPERTY(int gridUnit READ gridUnit NOTIFY gridUnitChanged())
/** /**
* units.iconSizes provides access to platform-dependent icon sizing * units.iconSizes provides access to platform-dependent icon sizing
@ -75,7 +75,7 @@ public:
bool eventFilter(QObject *watched, QEvent *event); bool eventFilter(QObject *watched, QEvent *event);
qreal gridUnit() const; int gridUnit() const;
/** /**