diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-06-04 13:34:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 10:14:01 +0200 |
| commit | c37c4215b0cfd31967b5799ebb0f0e78a55f7e85 (patch) | |
| tree | e4bc695f80093b598c325ab530ed61605b79a943 /src/quick/items/qquickflickable_p.h | |
| parent | 734c8ffbd361467d01eb278e9e289795f7139e94 (diff) | |
Don't emit moving and flicking signals unnecessarily
The moving and flicking signals should only be emitted once when
the view has been moved/flicked both vertically and horizontally. (This
was already done correctly for the dragging signals.)
Also changes QQuickFlickable::flick() to return bool instead of void.
Subclasses no longer emit the flicking signals but call
flickingStarted() instead.
Also splits the tst_qquickflickable::movingAndDragging() test up into
several tests.
Change-Id: Ie527568a9702049dd0bcda18c2eb3e43d8938a18
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickflickable_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 109bca2112..08aa487951 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -237,10 +237,9 @@ protected: protected Q_SLOTS: void movementStarting(); void movementEnding(); + void movementEnding(bool hMovementEnding, bool vMovementEnding); protected: - void movementXEnding(); - void movementYEnding(); virtual qreal minXExtent() const; virtual qreal minYExtent() const; virtual qreal maxXExtent() const; |