diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2016-03-19 07:57:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-19 10:15:32 +0000 |
| commit | e1124d28d66610375b3ee95680c427409ac564ca (patch) | |
| tree | f1fb92bc030a375f68d4b6f5655a5070af5b1199 /src | |
| parent | f7dfe53577ad7570efde644cd607577b38ca1aec (diff) | |
Move QQuickSwitch::positionAt() to QQuickSwitchPrivate
Hide it from the semi-public API for now, so we don't need to commit
to it until we know if it's really needed.
Change-Id: Ic9b8deaa5d39bffb6f4649a64306687aea8db3fa
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/qquickswitch.cpp | 20 | ||||
| -rw-r--r-- | src/templates/qquickswitch_p.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp index 4299877d..1b81606f 100644 --- a/src/templates/qquickswitch.cpp +++ b/src/templates/qquickswitch.cpp @@ -90,6 +90,7 @@ public: QQuickSwitchPrivate() : position(0) { } void updatePosition(); + qreal positionAt(const QPoint &point) const; bool handleMousePressEvent(QQuickItem *child, QMouseEvent *event); bool handleMouseMoveEvent(QQuickItem *child, QMouseEvent *event); @@ -106,6 +107,15 @@ void QQuickSwitchPrivate::updatePosition() q->setPosition(checked ? 1.0 : 0.0); } +qreal QQuickSwitchPrivate::positionAt(const QPoint &point) const +{ + Q_Q(const QQuickSwitch); + qreal pos = point.x() / indicator->width(); + if (q->isMirrored()) + return 1.0 - pos; + return pos; +} + bool QQuickSwitchPrivate::handleMousePressEvent(QQuickItem *child, QMouseEvent *event) { Q_Q(QQuickSwitch); @@ -122,7 +132,7 @@ bool QQuickSwitchPrivate::handleMouseMoveEvent(QQuickItem *child, QMouseEvent *e if (!child->keepMouseGrab()) child->setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->pos().x() - pressPoint.x(), Qt::XAxis, event)); if (child->keepMouseGrab()) { - q->setPosition(q->positionAt(event->pos())); + q->setPosition(positionAt(event->pos())); event->accept(); } return true; @@ -245,12 +255,4 @@ bool QQuickSwitch::childMouseEventFilter(QQuickItem *child, QEvent *event) return false; } -qreal QQuickSwitch::positionAt(const QPoint &point) const -{ - qreal pos = point.x() / indicator()->width(); - if (isMirrored()) - return 1.0 - pos; - return pos; -} - QT_END_NAMESPACE diff --git a/src/templates/qquickswitch_p.h b/src/templates/qquickswitch_p.h index 9097e89b..923ecc1c 100644 --- a/src/templates/qquickswitch_p.h +++ b/src/templates/qquickswitch_p.h @@ -76,8 +76,6 @@ protected: void mirrorChange() override; bool childMouseEventFilter(QQuickItem *child, QEvent *event) override; - virtual qreal positionAt(const QPoint &point) const; - private: Q_DISABLE_COPY(QQuickSwitch) Q_DECLARE_PRIVATE(QQuickSwitch) |