diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-09-28 15:14:17 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-09-28 13:14:57 +0000 |
| commit | cf00f2a1d967e8413d138ffe010e6928b469cb30 (patch) | |
| tree | b38ac7dd4a2338ce1238c4979206633209c259c6 | |
| parent | 8d404543015f608bd2dbee077a9534212663ab17 (diff) | |
Have sane default for QButtonAxisInput::scale
It doesn't quite make sense to have a null scale by default. It basically
forces to always touch the property to get something moving. Use a scale of 1
instead by default.
Change-Id: I813997d23ffedf1a934f79868f1f71f886b0303f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/input/frontend/qbuttonaxisinput.cpp | 4 | ||||
| -rw-r--r-- | src/input/frontend/qbuttonaxisinput_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp | 12 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index 6d95ad187..aaf1b6a1c 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -65,6 +65,8 @@ namespace Qt3DInput { */ /*! \qmlproperty real ButtonAxisInput::scale + Specifies how the axis output value is scaled. No scaling is applied by default + so it defaults to 1. */ /*! @@ -97,6 +99,8 @@ QButtonAxisInput::~QButtonAxisInput() /*! \property QButtonAxisInput::scale + Specifies how the axis output value is scaled. No scaling is applied by default + so it defaults to 1. */ void QButtonAxisInput::setScale(float scale) { diff --git a/src/input/frontend/qbuttonaxisinput_p.h b/src/input/frontend/qbuttonaxisinput_p.h index e56e58575..849498f06 100644 --- a/src/input/frontend/qbuttonaxisinput_p.h +++ b/src/input/frontend/qbuttonaxisinput_p.h @@ -62,7 +62,7 @@ class QButtonAxisInputPrivate : public QAbstractAxisInputPrivate public: QButtonAxisInputPrivate() : QAbstractAxisInputPrivate() - , m_scale(0.0f) + , m_scale(1.0f) , m_acceleration(-1.0f) , m_deceleration(-1.0f) {} diff --git a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp index 1a0459958..618c75d42 100644 --- a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp +++ b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp @@ -49,6 +49,18 @@ public: } private Q_SLOTS: + void shouldHaveDefaultState() + { + // GIVEN + Qt3DInput::QButtonAxisInput axisInput; + + // THEN + QVERIFY(axisInput.buttons().isEmpty()); + QCOMPARE(axisInput.scale(), 1.0f); + QCOMPARE(axisInput.acceleration(), -1.0f); + QCOMPARE(axisInput.deceleration(), -1.0f); + } + void checkCloning_data() { QTest::addColumn<Qt3DInput::QButtonAxisInput *>("axisInput"); |