aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickrectangle_p_p.h
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-10-16 17:55:46 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-22 18:23:12 +0200
commit29bfe1db8a5b4480317701ae508f0c920c925525 (patch)
tree041fc8d5f27a9a765382a2f5e552cc0143e292ef /src/quick/items/qquickrectangle_p_p.h
parent3aaadc5226e8914a562daa1d3d123da929d1affd (diff)
Make Rectangle border be inner instead of centered on the outline.
This avoids awkward situations such as when clipping to a parent item of the same size and makes it easier to reason about the bounding rectangle of the item. Task-number: QTBUG-21341 Change-Id: If015cfbc5792429f4a407fc0547ea71eca779eda Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/quick/items/qquickrectangle_p_p.h')
-rw-r--r--src/quick/items/qquickrectangle_p_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h
index d8f3d66968..3d4d019327 100644
--- a/src/quick/items/qquickrectangle_p_p.h
+++ b/src/quick/items/qquickrectangle_p_p.h
@@ -66,7 +66,7 @@ class QQuickRectanglePrivate : public QQuickItemPrivate
public:
QQuickRectanglePrivate() :
- color(Qt::white), gradient(0), pen(0), radius(0), penMargin(0), penOffset(0)
+ color(Qt::white), gradient(0), pen(0), radius(0)
{
}
@@ -79,8 +79,6 @@ public:
QQuickGradient *gradient;
QQuickPen *pen;
qreal radius;
- qreal penMargin;
- qreal penOffset;
static int doUpdateSlotIdx;
QQuickPen *getPen() {