aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickrectangle.cpp
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2012-07-17 13:26:25 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-18 15:20:29 +0200
commit03e174e986920cf727f11200daa8b0eecfe02216 (patch)
tree1ec418eece0d1864564fca8599f6c89b3b122e40 /src/quick/items/qquickrectangle.cpp
parent884bc89e9fe765a7be245b3009339f999936a761 (diff)
Rename Rectangle's border.aligned property to border.pixelAligned.
Rename the Rectangle element's border.aligned property to border.pixelAligned to be consistent with the Flickable element's pixelAligned property. Change-Id: I916a47416c558f9a96f7b966c344525db984a85f Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/qquickrectangle.cpp')
-rw-r--r--src/quick/items/qquickrectangle.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index 2789d8596d..ca4a9f55cc 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -108,12 +108,12 @@ void QQuickPen::setColor(const QColor &c)
emit penChanged();
}
-bool QQuickPen::aligned() const
+bool QQuickPen::pixelAligned() const
{
return m_aligned;
}
-void QQuickPen::setAligned(bool aligned)
+void QQuickPen::setPixelAligned(bool aligned)
{
if (aligned == m_aligned)
return;
@@ -318,7 +318,7 @@ void QQuickRectangle::doUpdate()
qreal penMargin = 0;
qreal penOffset = 0;
if (d->pen && d->pen->isValid()) {
- if (d->pen->aligned()) {
+ if (d->pen->pixelAligned()) {
const int pw = qRound(d->pen->width());
penMargin = qreal(0.5) * pw;
penOffset = (pw & 1) * qreal(0.5);
@@ -497,7 +497,7 @@ QSGNode *QQuickRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
if (d->pen && d->pen->isValid()) {
rectangle->setPenColor(d->pen->color());
rectangle->setPenWidth(d->pen->width());
- rectangle->setAligned(d->pen->aligned());
+ rectangle->setAligned(d->pen->pixelAligned());
} else {
rectangle->setPenWidth(0);
}