Merge lp:~dandrader/unity8/floatingFlickable into lp:unity8

[Daniel d'Andrada]

Introducing FloatingFlickable

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity8/ddaImprovements/+merge/255896 is a prerequisite

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1732
http://jenkins.qa.ubuntu.com/job/unity8-ci/5569/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/734
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19757

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5569/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

289+ Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)

Would it make sense to keep the upstream Flickable api? Just a thought. Not insisting on this if it makes the code internally more complicated.

===

279+ A Flickable that doesn't require the item being flicked to be its child.

Should be made more clear. Also the regular flickable doesn't require the items to be childs. The main point of this is, that the items can still have mouse interaction with this one, even though they are not direct childs of the Flickable. In other words, this one is transparent to input unless it really detected a flick.

===
507+ // We shouldn't need the three lines below, but a compiz/unity7

Is this still valid or just coped from some other gesture component? IIRC it's been ages ago we were suffering from that (1.5 years or so). Is this still about the same regression?

===

Otherwise looks good. Using it in the desktop-spread and it works great.

review: Needs Information

[Daniel d'Andrada (dandrader)]

> 289+ Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection
> NOTIFY directionChanged)
>
> Would it make sense to keep the upstream Flickable api? Just a thought. Not
> insisting on this if it makes the code internally more complicated.

I considered that, but Flickable's direction enum has more options, like vertical_and_horizontal and automatic, that DirectionalDragArea doesn't support and actually doesn't make sense for a DDA.

So all options from Flickable's direction enum I would have to drop the use of a DDA and write the touch handling from scratch for the FloatingFlickable. Totally doable but I rather avoid all this work unless we are planning those use those modes.

[lp:~dandrader/unity8/floatingFlickable]

1733. By Daniel d'Andrada on 2015-04-24

Merge trunk

[ CI Train Bot ]
* New rebuild forced.
[ Daniel d'Andrada ]
* Tapping home key shows unity8-dash home added:
  plugins/Utils/ElapsedTimer.h plugins/Utils/HomeKeyWatcher.cpp
  plugins/Utils/HomeKeyWatcher.h plugins/Utils/Timer.cpp
  plugins/Utils/Timer.h tests/plugins/Utils/homekeywatchertest.cpp
[ Michał Sawicz ]
* Tapping home key shows unity8-dash home added:
  plugins/Utils/ElapsedTimer.h plugins/Utils/HomeKeyWatcher.cpp
  plugins/Utils/HomeKeyWatcher.h plugins/Utils/Timer.cpp
  plugins/Utils/Timer.h tests/plugins/Utils/homekeywatchertest.cpp
[ Albert Astals Cid ]
* Compile with Qt 5.5 (LP: #1437238)
* Different way of top aligning labels when the other one in the row
  is multiline (LP: #1442085)
* make pot_file
[ Andrea Cimitan ]
* Set sourceSize for DashBackground.qml Image
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk. added: po/sk.po
[ Daniel d'Andrada ]
* Move handling of command line options to a separate class
* Refactor tst_PhysicalKeysMapper.qml
[ Leo Arias ]
* For autopilot tests, use the device simulation scenarios from the
  toolkit.
[ Leonardo Arias Fonseca ]
* For autopilot tests, use the device simulation scenarios from the
  toolkit.
[ Michael Zanetti ]
* Make sure dnd mode is ended properly when drag gesture is cancelled
  (LP: #1444949)
[ Michał Sawicz ]
* Fix flake8 warnings (LP: #1444170)
* Move mock indicator service to unity8-fake-env, as it's a binary-
  dependent package.
[ Nick Dedekind ]
* Use asynchronous dbus requests for property updates. (LP: #1436982)

1734. By Daniel d'Andrada on 2015-04-24

Improve documentation

[Daniel d'Andrada (dandrader)]

> 279+ A Flickable that doesn't require the item being flicked to be its
> child.
>
> Should be made more clear. Also the regular flickable doesn't require the
> items to be childs. The main point of this is, that the items can still have
> mouse interaction with this one, even though they are not direct childs of the
> Flickable. In other words, this one is transparent to input unless it really
> detected a flick.

Fixed

>
> ===
> 507+ // We shouldn't need the three lines below, but a compiz/unity7
>
> Is this still valid or just coped from some other gesture component? IIRC it's
> been ages ago we were suffering from that (1.5 years or so). Is this still
> about the same regression?
>

I don't know, I just copied it from tst_DirectionalDragArea. So yes, it's about the same regression.

[lp:~dandrader/unity8/floatingFlickable]

1735. By Daniel d'Andrada on 2015-04-24

Removing unneeded workaround

[Daniel d'Andrada (dandrader)]

> >
> > ===
> > 507+ // We shouldn't need the three lines below, but a compiz/unity7
> >
> > Is this still valid or just coped from some other gesture component? IIRC
> it's
> > been ages ago we were suffering from that (1.5 years or so). Is this still
> > about the same regression?
> >
>
> I don't know, I just copied it from tst_DirectionalDragArea. So yes, it's
> about the same regression.

Ok, removed it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1735
http://jenkins.qa.ubuntu.com/job/unity8-ci/5616/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/781
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2433
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19902

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5616/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Bad tags in this branch.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 27/04/15 07:40, Michael Zanetti wrote:
> Review: Needs Fixing
>
> Bad tags in this branch.
Fixed.

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes. using it in desktop-stage

 * Did CI run pass? If not, please explain why.

unrelated AP test failures

 * Did you make sure that the branch does not contain spurious tags?

y

review: Approve

=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
--- plugins/Ubuntu/Gestures/CMakeLists.txt	2015-04-24 15:23:24 +0000
+++ plugins/Ubuntu/Gestures/CMakeLists.txt	2015-04-24 15:23:25 +0000
@@ -7,6 +7,7 @@
     Damper.cpp
     Direction.cpp
     DirectionalDragArea.cpp
+    FloatingFlickable.cpp
     PressedOutsideNotifier.cpp
     TouchDispatcher.cpp
     TouchGate.cpp

=== modified file 'plugins/Ubuntu/Gestures/Direction.cpp'
--- plugins/Ubuntu/Gestures/Direction.cpp	2014-12-05 17:06:36 +0000
+++ plugins/Ubuntu/Gestures/Direction.cpp	2015-04-24 15:23:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,12 +25,15 @@
 
 bool Direction::isVertical(Direction::Type type)
 {
-    return type == Direction::Upwards || type == Direction::Downwards;
+    return type == Direction::Upwards
+        || type == Direction::Downwards
+        || type == Direction::Vertical;
 }
 
 bool Direction::isPositive(Direction::Type type)
 {
     return type == Rightwards
         || type == Downwards
-        || type == Horizontal;
+        || type == Horizontal
+        || type == Vertical;
 }

=== modified file 'plugins/Ubuntu/Gestures/Direction.h'
--- plugins/Ubuntu/Gestures/Direction.h	2014-12-05 17:06:36 +0000
+++ plugins/Ubuntu/Gestures/Direction.h	2015-04-24 15:23:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,8 @@
         Leftwards, // Along the negative direction of the X axis
         Downwards, // Along the positive direction of the Y axis
         Upwards, // Along the negative direction of the Y axis
-        Horizontal // Along the X axis, in any direction
+        Horizontal, // Along the X axis, in any direction
+        Vertical // Along the Y axis, in any direction
     };
 
     Q_INVOKABLE static bool isHorizontal(Direction::Type type);

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-04-24 15:23:24 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-04-24 15:23:25 +0000
@@ -506,7 +506,7 @@
 
 bool DirectionalDragAreaPrivate::movingInRightDirection() const
 {
-    if (direction == Direction::Horizontal) {
+    if (direction == Direction::Horizontal || direction == Direction::Vertical) {
         return true;
     } else {
         QPointF movementVector(dampedScenePos.x() - previousDampedScenePos.x(),
@@ -532,7 +532,7 @@
         ddaDebug(" movedFarEnoughAlongGestureAxis: scalarProjection=" << scalarProjection
             << ", distanceThreshold=" << distanceThreshold);
 
-        if (direction == Direction::Horizontal) {
+        if (direction == Direction::Horizontal || direction == Direction::Vertical) {
             return qAbs(scalarProjection) > distanceThreshold;
         } else {
             return scalarProjection > distanceThreshold;
@@ -843,6 +843,7 @@
             localDirection.ry() = -1.;
             break;
         case Direction::Downwards:
+        case Direction::Vertical:
             localDirection.rx() = 0.;
             localDirection.ry() = 1;
             break;

=== added file 'plugins/Ubuntu/Gestures/FloatingFlickable.cpp'
--- plugins/Ubuntu/Gestures/FloatingFlickable.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/FloatingFlickable.cpp	2015-04-24 15:23:25 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "FloatingFlickable.h"
+
+#include <private/qquickflickable_p.h>
+#include "DirectionalDragArea.h"
+
+#include <QDebug>
+
+FloatingFlickable::FloatingFlickable(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_mousePressed(false)
+{
+    m_dragArea = new DirectionalDragArea(this);
+    m_dragArea->setWidth(width());
+    m_dragArea->setHeight(height());
+    m_dragArea->setDirection(Direction::Horizontal);
+    connect(m_dragArea, &DirectionalDragArea::touchXChanged,
+        this, &FloatingFlickable::onDragAreaTouchPosChanged);
+    connect(m_dragArea, &DirectionalDragArea::touchYChanged,
+        this, &FloatingFlickable::onDragAreaTouchPosChanged);
+    connect(m_dragArea, &DirectionalDragArea::draggingChanged,
+        this, &FloatingFlickable::onDragAreaDraggingChanged);
+    connect(m_dragArea, &DirectionalDragArea::directionChanged, this, &FloatingFlickable::directionChanged);
+
+    m_flickable = new QQuickFlickable(this);
+    m_flickable->setEnabled(false);
+    m_flickable->setWidth(width());
+    m_flickable->setHeight(height());
+    connect(m_flickable, &QQuickFlickable::contentWidthChanged, this, &FloatingFlickable::contentWidthChanged);
+    connect(m_flickable, &QQuickFlickable::contentHeightChanged, this, &FloatingFlickable::contentHeightChanged);
+    connect(m_flickable, &QQuickFlickable::contentXChanged, this, &FloatingFlickable::contentXChanged);
+    connect(m_flickable, &QQuickFlickable::contentYChanged, this, &FloatingFlickable::contentYChanged);
+
+    connect(this, &QQuickItem::widthChanged, this, &FloatingFlickable::updateChildrenWidth);
+    connect(this, &QQuickItem::heightChanged, this, &FloatingFlickable::updateChildrenHeight);
+}
+
+qreal FloatingFlickable::contentWidth() const
+{
+    return m_flickable->contentWidth();
+}
+
+void FloatingFlickable::setContentWidth(qreal contentWidth)
+{
+    m_flickable->setContentWidth(contentWidth);
+}
+
+qreal FloatingFlickable::contentHeight() const
+{
+    return m_flickable->contentHeight();
+}
+
+void FloatingFlickable::setContentHeight(qreal contentHeight)
+{
+    m_flickable->setContentHeight(contentHeight);
+}
+
+qreal FloatingFlickable::contentX() const
+{
+    return m_flickable->contentX();
+}
+
+void FloatingFlickable::setContentX(qreal contentX)
+{
+    m_flickable->setContentX(contentX);
+}
+
+qreal FloatingFlickable::contentY() const
+{
+    return m_flickable->contentY();
+}
+
+void FloatingFlickable::setContentY(qreal contentY)
+{
+    m_flickable->setContentY(contentY);
+}
+
+Direction::Type FloatingFlickable::direction() const
+{
+    return m_dragArea->direction();
+}
+
+void FloatingFlickable::setDirection(Direction::Type direction)
+{
+    m_dragArea->setDirection(direction);
+    if (Direction::isHorizontal(direction)) {
+        m_flickable->setFlickableDirection(QQuickFlickable::HorizontalFlick);
+    } else {
+        m_flickable->setFlickableDirection(QQuickFlickable::VerticalFlick);
+    }
+}
+
+void FloatingFlickable::updateChildrenWidth()
+{
+    m_dragArea->setWidth(width());
+    m_flickable->setWidth(width());
+}
+
+void FloatingFlickable::updateChildrenHeight()
+{
+    m_dragArea->setHeight(height());
+    m_flickable->setHeight(height());
+}
+
+void FloatingFlickable::onDragAreaTouchPosChanged(qreal)
+{
+    if (m_mousePressed) {
+        QMouseEvent mouseEvent(QEvent::MouseMove,
+                QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
+                Qt::NoButton, Qt::LeftButton, Qt::NoModifier);
+
+        QCoreApplication::sendEvent(m_flickable, &mouseEvent);
+
+    }
+}
+
+void FloatingFlickable::onDragAreaDraggingChanged(bool dragging)
+{
+    if (dragging && !m_mousePressed) {
+        QMouseEvent mouseEvent(QEvent::MouseButtonPress,
+                QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
+                Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+
+        QCoreApplication::sendEvent(m_flickable, &mouseEvent);
+        m_mousePressed = true;
+
+    } else if (!dragging && m_mousePressed) {
+        QMouseEvent mouseEvent(QEvent::MouseButtonRelease,
+                QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
+                Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+
+        QCoreApplication::sendEvent(m_flickable, &mouseEvent);
+        m_mousePressed = false;
+    }
+}

=== added file 'plugins/Ubuntu/Gestures/FloatingFlickable.h'
--- plugins/Ubuntu/Gestures/FloatingFlickable.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/FloatingFlickable.h	2015-04-24 15:23:25 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FLOATING_FLICKABLE_H
+#define FLOATING_FLICKABLE_H
+
+#include <QQuickItem>
+#include "UbuntuGesturesQmlGlobal.h"
+#include "Direction.h"
+
+class DirectionalDragArea;
+class QQuickFlickable;
+
+/*
+    A Flickable that can be put in front of the item to be flicked and
+    still have the item-to-be-flicked receive input events that are not flicks.
+
+    Ie, it's a Flickable that, input-wise, is transparent to non-flick gestures.
+
+    With a regular Flickable you would have to make the item-to-be-flicked a child
+    of Flicakble to achieve the same result. FloatingFlickable has no such requirement
+    or limitation.
+ */
+class UBUNTUGESTURESQML_EXPORT FloatingFlickable : public QQuickItem {
+    Q_OBJECT
+
+    Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged)
+    Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)
+    Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged)
+    Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged)
+
+    Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)
+
+Q_SIGNALS:
+    void contentWidthChanged();
+    void contentHeightChanged();
+    void contentXChanged();
+    void contentYChanged();
+    void directionChanged();
+
+public:
+    FloatingFlickable(QQuickItem *parent = nullptr);
+
+    qreal contentWidth() const;
+    void setContentWidth(qreal contentWidth);
+
+    qreal contentHeight() const;
+    void setContentHeight(qreal contentHeight);
+
+    qreal contentX() const;
+    void setContentX(qreal contentX);
+
+    qreal contentY() const;
+    void setContentY(qreal contentY);
+
+    Direction::Type direction() const;
+    void setDirection(Direction::Type);
+
+private Q_SLOTS:
+    void updateChildrenWidth();
+    void updateChildrenHeight();
+    void onDragAreaTouchPosChanged(qreal);
+    void onDragAreaDraggingChanged(bool value);
+
+private:
+    DirectionalDragArea *m_dragArea;
+    QQuickFlickable *m_flickable;
+    bool m_mousePressed;
+
+    friend class tst_FloatingFlickable;
+};
+
+#endif // FLOATING_FLICKABLE_H

=== modified file 'plugins/Ubuntu/Gestures/plugin.cpp'
--- plugins/Ubuntu/Gestures/plugin.cpp	2014-10-01 13:20:32 +0000
+++ plugins/Ubuntu/Gestures/plugin.cpp	2015-04-24 15:23:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 #include "AxisVelocityCalculator.h"
 #include "Direction.h"
 #include "DirectionalDragArea.h"
+#include "FloatingFlickable.h"
 #include "PressedOutsideNotifier.h"
 #include "TouchGate.h"
 
@@ -34,6 +35,7 @@
     qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
     qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
     qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
+    qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");
     qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
     qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
 }

=== modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
--- tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2015-04-24 15:23:24 +0000
+++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2015-04-24 15:23:25 +0000
@@ -22,7 +22,7 @@
 add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")
 
 macro(add_gesture_ui_test CLASSNAME)
-    add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp)
+    add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)
     qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
     target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml UbuntuGestures)
 
@@ -46,6 +46,7 @@
 endmacro(add_gesture_test)
 
 add_gesture_ui_test(DirectionalDragArea)
+add_gesture_ui_test(FloatingFlickable)
 add_gesture_ui_test(PressedOutsideNotifier)
 add_gesture_ui_test(TouchDispatcher)
 add_gesture_ui_test(TouchGate)

=== added file 'tests/plugins/Ubuntu/Gestures/TestItem.cpp'
--- tests/plugins/Ubuntu/Gestures/TestItem.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/TestItem.cpp	2015-04-24 15:23:25 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "TestItem.h"
+
+#include <QTouchEvent>
+
+void TestItem::touchEvent(QTouchEvent *event)
+{
+    QTouchEvent *clonedEvent = new QTouchEvent(event->type(),
+            event->device(),
+            event->modifiers(),
+            event->touchPointStates(),
+            event->touchPoints());
+
+    touchEventsReceived.append(QSharedPointer<QTouchEvent>(clonedEvent));
+}

=== added file 'tests/plugins/Ubuntu/Gestures/TestItem.h'
--- tests/plugins/Ubuntu/Gestures/TestItem.h	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/TestItem.h	2015-04-24 15:23:25 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBUNTUGESTURES_TEST_ITEM_H
+#define UBUNTUGESTURES_TEST_ITEM_H
+
+#include <QQuickItem>
+
+class TestItem : public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    QList<QSharedPointer<QTouchEvent>> touchEventsReceived;
+
+protected:
+    void touchEvent(QTouchEvent *event) override;
+};
+
+#endif // UBUNTUGESTURES_TEST_ITEM_H

=== added file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp	2015-04-24 15:23:25 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest>
+#include <QQuickView>
+
+// Ubuntu.Gestures plugin
+#include <DirectionalDragArea.h>
+#include <FloatingFlickable.h>
+
+#include "GestureTest.h"
+#include "TestItem.h"
+
+using namespace UbuntuGestures;
+
+class tst_FloatingFlickable: public GestureTest
+{
+    Q_OBJECT
+public:
+    tst_FloatingFlickable();
+private Q_SLOTS:
+    void tapGoesThrough();
+    void flickChangesContentX();
+    void flickChangesContentY();
+};
+
+tst_FloatingFlickable::tst_FloatingFlickable()
+    : GestureTest(QStringLiteral("tst_FloatingFlickable.qml"))
+{
+}
+
+void tst_FloatingFlickable::tapGoesThrough()
+{
+    FloatingFlickable *floatingFlickable =
+        m_view->rootObject()->findChild<FloatingFlickable*>("floatingFlickable");
+    QVERIFY(floatingFlickable != nullptr);
+
+    TestItem *testItem = new TestItem;
+    testItem->setWidth(floatingFlickable->width());
+    testItem->setHeight(floatingFlickable->height());
+    testItem->setParentItem(m_view->rootObject());
+    testItem->setZ(1.0);
+
+    floatingFlickable->setZ(2.0);
+
+    QTest::touchEvent(m_view, m_device)
+        .press(0, QPoint(floatingFlickable->width()/2, floatingFlickable->height()/2));
+
+    QCOMPARE(testItem->touchEventsReceived.count(), 1);
+}
+
+void tst_FloatingFlickable::flickChangesContentX()
+{
+    FloatingFlickable *floatingFlickable =
+        m_view->rootObject()->findChild<FloatingFlickable*>("floatingFlickable");
+    QVERIFY(floatingFlickable != nullptr);
+
+    floatingFlickable->m_dragArea->removeTimeConstraints();
+
+    qreal startContentX = floatingFlickable->contentX();
+
+    QPoint startPos(floatingFlickable->width() - 5, 10);
+    int stepCount = 20;
+    int step = (startPos.x() - 5) / stepCount;
+
+    QTest::touchEvent(m_view, m_device).press(0, startPos);
+    for (int i = 0; i < stepCount; ++i) {
+        QTest::qWait(10);
+        QPoint touchPos = startPos - QPoint(step*i, 0);
+        QTest::touchEvent(m_view, m_device).move(0, touchPos);
+    }
+
+    QTest::qWait(10);
+    QTest::touchEvent(m_view, m_device).release(0, QPoint(5, 10));
+
+    QVERIFY(floatingFlickable->contentX() > (startContentX + floatingFlickable->width()/2));
+}
+
+void tst_FloatingFlickable::flickChangesContentY()
+{
+    FloatingFlickable *floatingFlickable =
+        m_view->rootObject()->findChild<FloatingFlickable*>("floatingFlickable");
+    QVERIFY(floatingFlickable != nullptr);
+
+    floatingFlickable->setDirection(Direction::Vertical);
+    floatingFlickable->m_dragArea->removeTimeConstraints();
+
+    qreal startContentY = floatingFlickable->contentY();
+
+    QPoint startPos(10, floatingFlickable->height() - 5);
+    int stepCount = 20;
+    int step = (startPos.y() - 5) / stepCount;
+
+    QTest::touchEvent(m_view, m_device).press(0, startPos);
+    for (int i = 0; i < stepCount; ++i) {
+        QTest::qWait(10);
+        QPoint touchPos = startPos - QPoint(0, step*i);
+        QTest::touchEvent(m_view, m_device).move(0, touchPos);
+    }
+
+    QTest::qWait(10);
+    QTest::touchEvent(m_view, m_device).release(0, QPoint(10, 5));
+
+    QVERIFY(floatingFlickable->contentY() > (startContentY + floatingFlickable->height()/2));
+}
+
+QTEST_MAIN(tst_FloatingFlickable)
+
+#include "tst_FloatingFlickable.moc"

=== added file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-04-24 15:23:25 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Gestures 0.1
+import Unity.Test 0.1
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(60)
+    color: "white"
+
+    Binding {
+        target: MouseTouchAdaptor
+        property: "enabled"
+        value: true
+    }
+
+    Grid {
+        id: colorGrid
+        readonly property bool horizontal: floatingFlickable.direction === Direction.Horizontal
+        x: horizontal ? -floatingFlickable.contentX : 0
+        y: horizontal ? 0 : -floatingFlickable.contentY
+        rows: horizontal ? 1 : 100
+        columns: horizontal ? 100 : 1
+        Repeater {
+            model: 100
+            Rectangle {
+                width: colorGrid.horizontal ? units.gu(12) : root.width
+                height: colorGrid.horizontal ? root.height : units.gu(12)
+                color: mouseArea.pressed ? "red"
+                                         : Qt.rgba(Math.random(), Math.random(), Math.random(), 1)
+                MouseArea {
+                    id: mouseArea
+                    anchors.fill: parent
+                }
+            }
+        }
+    }
+
+    FloatingFlickable {
+        id: floatingFlickable
+        objectName: "floatingFlickable"
+        anchors.fill: parent
+        contentWidth: colorGrid.width
+        contentHeight: colorGrid.height
+    }
+
+    Button {
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.margins: units.gu(1)
+
+        text: floatingFlickable.direction === Direction.Horizontal ? "Horizontal" : "Vertical"
+        activeFocusOnPress: false
+
+        onClicked: {
+            if (floatingFlickable.direction === Direction.Horizontal) {
+                floatingFlickable.direction = Direction.Vertical;
+            } else {
+                floatingFlickable.direction = Direction.Horizontal;
+            }
+        }
+    }
+}

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp	2015-04-24 15:23:24 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp	2015-04-24 15:23:25 +0000
@@ -29,16 +29,7 @@
 #include <TouchGate.h>
 #include <TouchRegistry.h>
 
-class TestItem : public QQuickItem
-{
-    Q_OBJECT
-
-public:
-    QList<QSharedPointer<QTouchEvent>> touchEventsReceived;
-
-protected:
-    void touchEvent(QTouchEvent *event) override;
-};
+#include "TestItem.h"
 
 class CandidateItem : public QQuickItem
 {
@@ -381,19 +372,6 @@
     }
 }
 
-///////////// TestItem /////////////////////////////////////////////////////////////
-
-void TestItem::touchEvent(QTouchEvent *event)
-{
-    QTouchEvent *clonedEvent = new QTouchEvent(event->type(),
-            event->device(),
-            event->modifiers(),
-            event->touchPointStates(),
-            event->touchPoints());
-
-    touchEventsReceived.append(QSharedPointer<QTouchEvent>(clonedEvent));
-}
-
 ///////////// CandidateItem /////////////////////////////////////////////////////////////
 
 void CandidateItem::touchEvent(QTouchEvent *event)