diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-11-25 15:22:09 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-25 08:10:20 +0100 |
commit | 4ffa4881a8e7a8da85029aaf834aadca9ede0b91 (patch) | |
tree | f7366aa7cbff2c06c63a292d845aa216313b2606 /src | |
parent | f740895a71b6b0e7df5214cafa9c7746ca960ef7 (diff) |
Remove ints from mouse event handling.
Change-Id: Icda13ae3644dc274e08e626545df75d3e561cf87
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/items/qquickevents_p_p.h | 18 | ||||
-rw-r--r-- | src/declarative/items/qquickflickable.cpp | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/declarative/items/qquickevents_p_p.h b/src/declarative/items/qquickevents_p_p.h index cbe75ab9bf..cc5ed4f01e 100644 --- a/src/declarative/items/qquickevents_p_p.h +++ b/src/declarative/items/qquickevents_p_p.h @@ -94,8 +94,8 @@ private: class Q_DECLARATIVE_EXPORT QQuickMouseEvent : public QObject { Q_OBJECT - Q_PROPERTY(int x READ x) - Q_PROPERTY(int y READ y) + Q_PROPERTY(qreal x READ x) + Q_PROPERTY(qreal y READ y) Q_PROPERTY(int button READ button) Q_PROPERTY(int buttons READ buttons) Q_PROPERTY(int modifiers READ modifiers) @@ -104,13 +104,13 @@ class Q_DECLARATIVE_EXPORT QQuickMouseEvent : public QObject Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) public: - QQuickMouseEvent(int x, int y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers + QQuickMouseEvent(qreal x, qreal y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers , bool isClick=false, bool wasHeld=false) : _x(x), _y(y), _button(button), _buttons(buttons), _modifiers(modifiers) , _wasHeld(wasHeld), _isClick(isClick), _accepted(true) {} - int x() const { return _x; } - int y() const { return _y; } + qreal x() const { return _x; } + qreal y() const { return _y; } int button() const { return _button; } int buttons() const { return _buttons; } int modifiers() const { return _modifiers; } @@ -118,16 +118,16 @@ public: bool isClick() const { return _isClick; } // only for internal usage - void setX(int x) { _x = x; } - void setY(int y) { _y = y; } + void setX(qreal x) { _x = x; } + void setY(qreal y) { _y = y; } void setPosition(const QPointF &point) { _x = point.x(); _y = point.y(); } bool isAccepted() { return _accepted; } void setAccepted(bool accepted) { _accepted = accepted; } private: - int _x; - int _y; + qreal _x; + qreal _y; Qt::MouseButton _button; Qt::MouseButtons _buttons; Qt::KeyboardModifiers _modifiers; diff --git a/src/declarative/items/qquickflickable.cpp b/src/declarative/items/qquickflickable.cpp index 0c24aa35b4..2f7b74453e 100644 --- a/src/declarative/items/qquickflickable.cpp +++ b/src/declarative/items/qquickflickable.cpp @@ -812,7 +812,7 @@ void QQuickFlickablePrivate::handleMousePressEvent(QMouseEvent *event) hData.dragMaxBound = q->maxXExtent(); vData.dragMaxBound = q->maxYExtent(); fixupMode = Normal; - lastPos = QPoint(); + lastPos = QPointF(); QQuickItemPrivate::start(lastPosTime); pressPos = event->localPos(); hData.pressPos = hData.move.value(); @@ -835,7 +835,7 @@ void QQuickFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) bool stealX = stealMouse; if (q->yflick()) { - int dy = int(event->localPos().y() - pressPos.y()); + qreal dy = event->localPos().y() - pressPos.y(); if (qAbs(dy) > qApp->styleHints()->startDragDistance() || QQuickItemPrivate::elapsed(pressTime) > 200) { if (!vMoved) vData.dragStartOffset = dy; @@ -867,7 +867,7 @@ void QQuickFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) } if (q->xflick()) { - int dx = int(event->localPos().x() - pressPos.x()); + qreal dx = event->localPos().x() - pressPos.x(); if (qAbs(dx) > qApp->styleHints()->startDragDistance() || QQuickItemPrivate::elapsed(pressTime) > 200) { if (!hMoved) hData.dragStartOffset = dx; |