diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2011-07-26 11:47:19 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 06:29:54 +0200 |
commit | df5c836fe9753e81cda4a30fa27ce7af5e6f9a5f (patch) | |
tree | 1ee81e115c1f8434df0ee7352cd0c029b0abc94b /src/declarative/items/qsgmousearea.cpp | |
parent | d0b8a04c8d6801b84b7bd6fd62e921fbb45f0fe2 (diff) |
Remove onMousePositionChanged signal.
This signal was meant to be "private" (not directly used from QML).
Provide separate signals for onMouseXChanged and onMouseYChanged.
Task-number: QTBUG-18656
Change-Id: Iefc3d78e270db9c037bbb1b890925b4841f2d5fa
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/2142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgmousearea.cpp')
-rw-r--r-- | src/declarative/items/qsgmousearea.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index f65fbbaa4e..c4b7fc08ca 100644 --- a/src/declarative/items/qsgmousearea.cpp +++ b/src/declarative/items/qsgmousearea.cpp @@ -586,9 +586,10 @@ void QSGMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } } QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress); - emit mousePositionChanged(&me); - me.setX(d->lastPos.x()); - me.setY(d->lastPos.y()); + emit mouseXChanged(&me); + me.setPosition(d->lastPos); + emit mouseYChanged(&me); + me.setPosition(d->lastPos); emit positionChanged(&me); if(!event->isAccepted() && d->forwardToList.count()) @@ -663,7 +664,10 @@ void QSGMouseArea::hoverEnterEvent(QHoverEvent *event) d->lastModifiers = event->modifiers(); setHovered(true); QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, d->lastModifiers, false, false); - emit mousePositionChanged(&me); + emit mouseXChanged(&me); + me.setPosition(d->lastPos); + emit mouseYChanged(&me); + me.setPosition(d->lastPos); } } @@ -676,9 +680,10 @@ void QSGMouseArea::hoverMoveEvent(QHoverEvent *event) d->lastPos = event->posF(); d->lastModifiers = event->modifiers(); QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, d->lastModifiers, false, false); - emit mousePositionChanged(&me); - me.setX(d->lastPos.x()); - me.setY(d->lastPos.y()); + emit mouseXChanged(&me); + me.setPosition(d->lastPos); + emit mouseYChanged(&me); + me.setPosition(d->lastPos); emit positionChanged(&me); } } @@ -893,14 +898,14 @@ bool QSGMouseArea::setPressed(bool p) if (d->pressed) { if (!d->doubleClick) emit pressed(&me); - me.setX(d->lastPos.x()); - me.setY(d->lastPos.y()); - emit mousePositionChanged(&me); + me.setPosition(d->lastPos); + emit mouseXChanged(&me); + me.setPosition(d->lastPos); + emit mouseYChanged(&me); emit pressedChanged(); } else { emit released(&me); - me.setX(d->lastPos.x()); - me.setY(d->lastPos.y()); + me.setPosition(d->lastPos); emit pressedChanged(); if (isclick && !d->longPress && !d->doubleClick){ me.setAccepted(d->isClickConnected()); |