Commit 03e174e9 authored by Kim Motoyoshi Kalland's avatar Kim Motoyoshi Kalland Committed by Qt by Nokia
Browse files

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: default avatarGunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: default avatarMichael Brasser <michael.brasser@nokia.com>
parent 884bc89e
No related merge requests found
Showing with 7 additions and 7 deletions
......@@ -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);
}
......
......@@ -58,7 +58,7 @@ class Q_AUTOTEST_EXPORT QQuickPen : public QObject
Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY penChanged)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged)
Q_PROPERTY(bool aligned READ aligned WRITE setAligned NOTIFY penChanged)
Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY penChanged)
public:
QQuickPen(QObject *parent=0);
......@@ -68,8 +68,8 @@ public:
QColor color() const;
void setColor(const QColor &c);
bool aligned() const;
void setAligned(bool aligned);
bool pixelAligned() const;
void setPixelAligned(bool aligned);
bool isValid() const;
......
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