diff options
| author | John Layt <jlayt@kde.org> | 2014-02-07 11:47:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-21 20:33:10 +0100 |
| commit | 3aae3e81ef55b4131eff0520d67f2594ee9e507c (patch) | |
| tree | ee33784d65b3683aaf8aae17dda494560e3c8a24 /tests/auto/corelib/tools/qrect | |
| parent | c7aa3a69253c82b8ae814c88ebbdfad7e48d0b2d (diff) | |
QMarginsF - Add new QMarginsF class
Add a new QMarginsF class to complement QMargins in the style of
QSize/QSizeF and QRect/QRectF.
[ChangeLog][QtCore] Added class QMarginsF to support handling margins
with floating-point values.
Change-Id: Iaaa95ec85f5d126d9d864fc4b607241a8c8a8f3a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qrect')
| -rw-r--r-- | tests/auto/corelib/tools/qrect/tst_qrect.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp index c5e3aa58e0..81222552ca 100644 --- a/tests/auto/corelib/tools/qrect/tst_qrect.cpp +++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp @@ -135,6 +135,7 @@ private slots: void newMoveBottomRight_data(); void newMoveBottomRight(); void margins(); + void marginsf(); void translate_data(); void translate(); @@ -3510,6 +3511,30 @@ void tst_QRect::margins() QCOMPARE(a, rectangle.marginsRemoved(margins)); } +void tst_QRect::marginsf() +{ + const QRectF rectangle = QRectF(QPointF(10.5, 10.5), QSizeF(50.5 ,150.5)); + const QMarginsF margins = QMarginsF(2.5, 3.5, 4.5, 5.5); + + const QRectF added = rectangle + margins; + QCOMPARE(added, QRectF(QPointF(8.0, 7.0), QSizeF(57.5, 159.5))); + QCOMPARE(added, margins + rectangle); + QCOMPARE(added, rectangle.marginsAdded(margins)); + + const QRectF subtracted = rectangle - margins; + QCOMPARE(subtracted, QRectF(QPointF(13.0, 14.0), QSizeF(43.5, 141.5))); + QCOMPARE(subtracted, rectangle.marginsRemoved(margins)); + + QRectF a = rectangle; + a += margins; + QCOMPARE(added, a); + + a = rectangle; + a -= margins; + QCOMPARE(a, QRectF(QPoint(13.0, 14.0), QSizeF(43.5, 141.5))); + QCOMPARE(a, rectangle.marginsRemoved(margins)); +} + void tst_QRect::translate_data() { QTest::addColumn<QRect>("r"); |