diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-08-15 12:55:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-16 08:16:14 +0200 |
| commit | ec68295138b3cd4ee45cb28ef604212c4e9a9f50 (patch) | |
| tree | f1774e9f9dcf03c732a57a0525375afe94525021 /src/declarative/items/qsgrectangle_p_p.h | |
| parent | c5b56564667194b179ebfcc87608d38e9969fade (diff) | |
Fixed clip on QML2 rectangles to include the borders.
This is related to commit 31ebb4bfb0df83805c5d86b6773f11ba1145c7cd.
Task-number: QTBUG-20547
Change-Id: I6a5b6c56d440c7fa7f5546472305f62227b64c29
Reviewed-on: http://codereview.qt.nokia.com/2952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgrectangle_p_p.h')
| -rw-r--r-- | src/declarative/items/qsgrectangle_p_p.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/declarative/items/qsgrectangle_p_p.h b/src/declarative/items/qsgrectangle_p_p.h index 6e1beb7bdb..234a029aaf 100644 --- a/src/declarative/items/qsgrectangle_p_p.h +++ b/src/declarative/items/qsgrectangle_p_p.h @@ -66,7 +66,7 @@ class QSGRectanglePrivate : public QSGItemPrivate public: QSGRectanglePrivate() : - color(Qt::white), gradient(0), pen(0), radius(0), paintmargin(0) + color(Qt::white), gradient(0), pen(0), radius(0), penMargin(0), penOffset(0) { } @@ -79,7 +79,8 @@ public: QSGGradient *gradient; QSGPen *pen; qreal radius; - qreal paintmargin; + qreal penMargin; + qreal penOffset; static int doUpdateSlotIdx; QSGPen *getPen() { @@ -95,13 +96,6 @@ public: } return pen; } - - void setPaintMargin(qreal margin) - { - if (margin == paintmargin) - return; - paintmargin = margin; - } }; QT_END_NAMESPACE |