Unity 8

Dash/Apps/RunningApplicationsGrid.qml (+17/-0)
plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-0)
plugins/Ubuntu/Gestures/PressedOutsideNotifier.cpp (+119/-0)
plugins/Ubuntu/Gestures/PressedOutsideNotifier.h (+62/-0)
plugins/Ubuntu/Gestures/plugin.cpp (+2/-0)
tests/plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-0)
tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp (+150/-0)
tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml (+62/-0)
tests/qmltests/CMakeLists.txt (+3/-1)
tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml (+20/-0)

To merge this branch:

bzr merge lp:~dandrader/unity8/runningAppsEndClose

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-11-22	Approve on 2013-11-30
Albert Astals Cid (community)			Approve on 2013-11-29
Michał Sawicz		2013-11-22	Pending
Review via email: mp+196257@code.launchpad.net

This proposal supersedes a proposal from 2013-11-20.

Commit message

Dash: disable close mode when you click outside app thumbnails

To leave the termination mode you can now just mouse/touch press anywhere
outside the running applications' thumbnails

The other way, which still works, is long-pressing a thumbnail once more.

Description of the change

Fixes bug 1193414.

InverseMouseArea is not fit for this job (e.g. doesn't work with touches when in topMostMode), thus I created a simple, light-weight, PressedOutsideNotifier that suites perfectly our needs.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-11-20: Posted in a previous version of this proposal

tst_PressedOutsideNotifier.qml: bad whitespace in line 37

BUT... Isn't InverseMouseArea supposed to do the same thing?

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-21: Posted in a previous version of this proposal

> tst_PressedOutsideNotifier.qml: bad whitespace in line 37

Fixed.

> BUT... Isn't InverseMouseArea supposed to do the same thing?

Kind-of, but it's hindered by all the promises its API makes (it's a bit of a mess IMHO) and doesn't really work for that case. Have you read the description?

e.g.: It would have, for instance, to monitor touch events and translate them to mouse events himself because it's a Inverse*Mouse*Area. When its topMost property is on it listens for input events at a level before QQuickWindow is able to synthesize touch events out of mouse events.

Thus instead of trying to have it working for our case it's easier to come up with something concise and simple designed to fit perfectly with our needs. Since we're not a library, we're free to do this kind of things, which is good.

I don't see the point in striving to use InverseMouseArea just for the sake of using it because it already exists. If it's about improving InverseMouseArea itself, I'm not too hopeful.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-11-21: Posted in a previous version of this proposal

> e.g.: It would have, for instance, to monitor touch events and translate them
> to mouse events himself because it's a Inverse*Mouse*Area. When its topMost
> property is on it listens for input events at a level before QQuickWindow is
> able to synthesize touch events out of mouse events.

But didn't you have a patch for Qt to fix that?

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-21: Posted in a previous version of this proposal

> > e.g.: It would have, for instance, to monitor touch events and translate
> them
> > to mouse events himself because it's a Inverse*Mouse*Area. When its topMost
> > property is on it listens for input events at a level before QQuickWindow is
> > able to synthesize touch events out of mouse events.
>
> But didn't you have a patch for Qt to fix that?

No. That's a different topic. But maybe InverseMouseArea does it to workaround that bug.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-11-21: Posted in a previous version of this proposal

> > > e.g.: It would have, for instance, to monitor touch events and translate
> > them
> > > to mouse events himself because it's a Inverse*Mouse*Area. When its
> topMost
> > > property is on it listens for input events at a level before QQuickWindow
> is
> > > able to synthesize touch events out of mouse events.
> >
> > But didn't you have a patch for Qt to fix that?
>
> No. That's a different topic. But maybe InverseMouseArea does it to workaround
> that bug.

Oh, it was my understanding that you where making the synthezised events go properly through the event stack again and thus they'd be caught by the InverseMouseArea and everything would just work.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-21: Posted in a previous version of this proposal

> > > > e.g.: It would have, for instance, to monitor touch events and translate
> > > them
> > > > to mouse events himself because it's a Inverse*Mouse*Area. When its
> > topMost
> > > > property is on it listens for input events at a level before
> QQuickWindow
> > is
> > > > able to synthesize touch events out of mouse events.
> > >
> > > But didn't you have a patch for Qt to fix that?
> >
> > No. That's a different topic. But maybe InverseMouseArea does it to
> workaround
> > that bug.
>
> Oh, it was my understanding that you where making the synthezised events go
> properly through the event stack again and thus they'd be caught by the
> InverseMouseArea and everything would just work.

A topMost InverseMouseArea listens for events at QGuiApplication level (a bad idea, IMHO). synthesized mouse events from QQuickWindow will never to that high up, and they shouldn't.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-21: Posted in a previous version of this proposal

> > > > > e.g.: It would have, for instance, to monitor touch events and
> translate
> > > > them
> > > > > to mouse events himself because it's a Inverse*Mouse*Area. When its
> > > topMost
> > > > > property is on it listens for input events at a level before
> > QQuickWindow
> > > is
> > > > > able to synthesize touch events out of mouse events.
> > > >
> > > > But didn't you have a patch for Qt to fix that?
> > >
> > > No. That's a different topic. But maybe InverseMouseArea does it to
> > workaround
> > > that bug.
> >
> > Oh, it was my understanding that you where making the synthezised events go
> > properly through the event stack again and thus they'd be caught by the
> > InverseMouseArea and everything would just work.
>
> A topMost InverseMouseArea listens for events at QGuiApplication level (a bad
> idea, IMHO). synthesized mouse events from QQuickWindow will never to that
> high up, and they shouldn't.

And even if it listened at the right level (rootItem), it still wouldn't work if there a touch-aware item in the scene that accepts the touches. In that situation QQuickWindow wound't synthesize mouse events out of the touch events because there's no need to.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-11-21: Posted in a previous version of this proposal

ok, in my opinion we should still fix InverseMouseArea to do what we want, i mean, what about all the other people out there that want to do exactly this? InverseMouseArea is supposed to do it, so why not fix it and then use it?

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-21: Posted in a previous version of this proposal

> And even if it listened at the right level (rootItem), it still wouldn't work
> if there a touch-aware item in the scene that accepts the touches. In that
> situation QQuickWindow wound't synthesize mouse events out of the touch events
> because there's no need to.

Ah, and for listening at the "right level", that's when you would need my fix.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-21: Posted in a previous version of this proposal

> ok, in my opinion we should still fix InverseMouseArea to do what we want, i
> mean, what about all the other people out there that want to do exactly this?
> InverseMouseArea is supposed to do it, so why not fix it and then use it?

Can't we do both?

1 - fix our UI *now*, which is what matters to the final user and people trying to sell our phone demoing it.
2 - Fix InverseMouseArea, so that application developer have better building blocks to build their ubuntu apps.

The thing is that item 2 requires much work because InverseMouseArea is meant to cover much more cases and has a more complex API. And we might have to sit around until my QQuickItem event dispatch fix is available in ubuntu repos, translating into even more time.

Item 1 is what the bug that this patch fixes is all about.
Item 2 is a bonus.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:538
http://jenkins.qa.ubuntu.com/job/unity8-ci/1693/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/958/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/942/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/354
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/216/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/216/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/958/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/942/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-11-21: Posted in a previous version of this proposal

Please split out the unrelated refactoring changes into a separate MP.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-22: Posted in a previous version of this proposal

> Please split out the unrelated refactoring changes into a separate MP.

And there it is:
https://code.launchpad.net/~dandrader/unity8/gestureTestsBaseClass/+merge/196256

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-11-22:

This is starting to grow on me, as we really have bad experience because of the IMA issues.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-22:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-22:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-22:

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

review: Approve (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-11-28:

I think you should restore the code that hides the [x] when changing scope, wihtout it i can:
* Long press in running app icon
* [x] appears
* Press inside the running icon and swipe right to home scope
* Wait there a few seconds
* Swipe back to the Apps scope
* See how the [x]-disappear animation triggers

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-29:

> I think you should restore the code that hides the [x] when changing scope,
> wihtout it i can:
> * Long press in running app icon
> * [x] appears
> * Press inside the running icon and swipe right to home scope
> * Wait there a few seconds
> * Swipe back to the Apps scope
> * See how the [x]-disappear animation triggers

Yeah, I've noticed that but decided to remove that code anyhow for the sake of making the code simpler.
Specially since in the new architecture Dash "scope views", the only way to communicate to them is through plain models (for better or worse) and that canEnableTermination mode pierces through it. Making GenericScopeView code uglier.

But, anyway, the user experience is what matters in the end and so I've put it back.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-11-29:

i was wondering if we can't just hijack the touch event by returning true at some point in the evenFilter and save us from all that timer stuff which looks a bit hacky

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-29:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-11-29:

> i was wondering if we can't just hijack the touch event by returning true at
> some point in the evenFilter and save us from all that timer stuff which looks
> a bit hacky

The point is to not interfere with the normal event processing. We're just monitoring it, not filtering it out. But I do agree that that timer is not the best thing in the world, thus the big comment.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-11-29:

Ok then

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-29:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-29:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-30:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-30:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-11-30:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'Dash/Apps/RunningApplicationsGrid.qml'
 --- Dash/Apps/RunningApplicationsGrid.qml	2013-10-02 11:01:49 +0000
 +++ Dash/Apps/RunningApplicationsGrid.qml	2013-11-29 11:22:23 +0000
@@ -17,6 +17,8 @@
  import QtQuick 2.0
  import "../../Components"
++import Ubuntu.Gestures 0.1
++
  ResponsiveFlowView {
      id: root
      clip: true
@@ -100,4 +102,19 @@
      move: Transition {
          NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutCubic }
+     }
++
++    MouseArea {
++        anchors.fill: parent
++        z: -1 // behind all RunningApplicationTiles
++        enabled: root.terminationModeEnabled
++        onPressed: { root.terminationModeEnabled = false; }
++    }
++
++    PressedOutsideNotifier {
++        anchors.fill: parent
++        enabled: root.terminationModeEnabled
++        onPressedOutside: {
++            root.terminationModeEnabled = false;
++        }
++    }
+ }
 === modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
 --- plugins/Ubuntu/Gestures/CMakeLists.txt	2013-10-22 15:56:37 +0000
 +++ plugins/Ubuntu/Gestures/CMakeLists.txt	2013-11-29 11:22:23 +0000
@@ -6,6 +6,7 @@
      AxisVelocityCalculator.cpp
      Direction.cpp
      DirectionalDragArea.cpp
++    PressedOutsideNotifier.cpp
      TimeSource.cpp
+ )
 === added file 'plugins/Ubuntu/Gestures/PressedOutsideNotifier.cpp'
 --- plugins/Ubuntu/Gestures/PressedOutsideNotifier.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Ubuntu/Gestures/PressedOutsideNotifier.cpp	2013-11-29 11:22:23 +0000
@@ -0,0 +1,119 @@
++/*
++ * Copyright (C) 2013 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 "PressedOutsideNotifier.h"
++
++#include <QMouseEvent>
++
++PressedOutsideNotifier::PressedOutsideNotifier(QQuickItem *parent)
++    : QQuickItem(parent)
++{
++    connect(this, &QQuickItem::enabledChanged,
++            this, &PressedOutsideNotifier::setupOrTearDownEventFiltering);
++
++    m_signalEmissionTimer.setSingleShot(true);
++    m_signalEmissionTimer.setInterval(0); // times out on the next iteration of the event loop
++    connect(&m_signalEmissionTimer, &QTimer::timeout,
++            this, &PressedOutsideNotifier::pressedOutside);
++}
++
++bool PressedOutsideNotifier::eventFilter(QObject *watched, QEvent *event)
++{
++    Q_UNUSED(watched);
++    Q_ASSERT(watched == m_filteredWindow);
++
++    // We are already going to emit pressedOutside() anyway, thus no need
++    // for new checks.
++    // This case takes place when a QTouchEvent comes in and isn't handled by any item,
++    // causing QQuickWindow to synthesize a QMouseEvent out of it, which would
++    // be filtered by us as well and count as a second press, which is wrong.
++    if (m_signalEmissionTimer.isActive()) {
++        return false;
++    }
++
++    switch (event->type()) {
++    case QEvent::MouseButtonPress: {
++        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
++        QPointF p = mapFromScene(mouseEvent->windowPos());
++        if (!contains(p)) {
++            m_signalEmissionTimer.start();
++        }
++        break;
++    }
++    case QEvent::TouchBegin:
++        processFilteredTouchBegin(static_cast<QTouchEvent*>(event));
++    default:
++        break;
++    }
++
++    // let the event be handled further
++    return false;
++}
++
++void PressedOutsideNotifier::itemChange(ItemChange change, const ItemChangeData &value)
++{
++    if (change == QQuickItem::ItemSceneChange) {
++        setupOrTearDownEventFiltering();
++    }
++
++    QQuickItem::itemChange(change, value);
++}
++
++void PressedOutsideNotifier::setupOrTearDownEventFiltering()
++{
++    if (isEnabled() && window()) {
++        setupEventFiltering();
++    } else if (m_filteredWindow) {
++        tearDownEventFiltering();
++    }
++}
++
++void PressedOutsideNotifier::setupEventFiltering()
++{
++    QQuickWindow *currentWindow = window();
++    Q_ASSERT(currentWindow != nullptr);
++
++    if (currentWindow == m_filteredWindow)
++        return;
++
++    if (m_filteredWindow) {
++        m_filteredWindow->removeEventFilter(this);
++    }
++
++    currentWindow->installEventFilter(this);
++    m_filteredWindow = currentWindow;
++}
++
++void PressedOutsideNotifier::tearDownEventFiltering()
++{
++    m_filteredWindow->removeEventFilter(this);
++    m_filteredWindow.clear();
++}
++
++void PressedOutsideNotifier::processFilteredTouchBegin(QTouchEvent *event)
++{
++    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
++    for (int i = 0; i < touchPoints.count(); ++i) {
++        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
++        if (touchPoint.state() == Qt::TouchPointPressed) {
++            QPointF p = mapFromScene(touchPoint.pos());
++            if (!contains(p)) {
++                m_signalEmissionTimer.start();
++                return;
++            }
++        }
++    }
++}
 === added file 'plugins/Ubuntu/Gestures/PressedOutsideNotifier.h'
 --- plugins/Ubuntu/Gestures/PressedOutsideNotifier.h	1970-01-01 00:00:00 +0000
 +++ plugins/Ubuntu/Gestures/PressedOutsideNotifier.h	2013-11-29 11:22:23 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2013 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 PRESSED_OUTSIDE_NOTIFIER_H
++#define PRESSED_OUTSIDE_NOTIFIER_H
++
++#include <QQuickItem>
++
++#include <QQuickWindow>
++#include <QPointer>
++#include <QTimer>
++
++#include "UbuntuGesturesGlobal.h"
++
++/*
++   Notifies when a point, mouse or touch, is pressed outside its area.
++
++   Only enable it while needed.
++ */
++class UBUNTUGESTURES_EXPORT PressedOutsideNotifier : public QQuickItem {
++    Q_OBJECT
++
++public:
++    PressedOutsideNotifier(QQuickItem * parent = nullptr);
++
++    // From QObject
++    bool eventFilter(QObject *watched, QEvent *event) override;
++
++Q_SIGNALS:
++    void pressedOutside();
++
++protected:
++    void itemChange(ItemChange change, const ItemChangeData &value) override;
++
++private Q_SLOTS:
++    void setupOrTearDownEventFiltering();
++
++private:
++    void setupEventFiltering();
++    void tearDownEventFiltering();
++    void processFilteredTouchBegin(QTouchEvent *event);
++
++    QPointer<QQuickWindow> m_filteredWindow;
++
++    // Emits pressedOutside() signal on timeout
++    QTimer m_signalEmissionTimer;
++};
++
++#endif // PRESSED_OUTSIDE_NOTIFIER_H
 === modified file 'plugins/Ubuntu/Gestures/plugin.cpp'
 --- plugins/Ubuntu/Gestures/plugin.cpp	2013-06-17 13:45:28 +0000
 +++ plugins/Ubuntu/Gestures/plugin.cpp	2013-11-29 11:22:23 +0000
@@ -18,6 +18,7 @@
  #include "AxisVelocityCalculator.h"
  #include "Direction.h"
  #include "DirectionalDragArea.h"
++#include "PressedOutsideNotifier.h"
  #include <qqml.h>
@@ -32,4 +33,5 @@
      qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
      qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
      qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
++    qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
+ }
 === modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
 --- tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2013-11-22 11:28:28 +0000
 +++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2013-11-29 11:22:23 +0000
@@ -45,5 +45,6 @@
  endmacro(add_gesture_test)
  add_gesture_ui_test(DirectionalDragArea)
++add_gesture_ui_test(PressedOutsideNotifier)
  add_gesture_test(Damper)
  add_gesture_test(AxisVelocityCalculator)
 === added file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp'
 --- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp	2013-11-29 11:22:23 +0000
@@ -0,0 +1,150 @@
++/*
++ * Copyright (C) 2013 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 "GestureTest.h"
++
++#include <PressedOutsideNotifier.h>
++
++#include <QQuickItem>
++#include <QQuickView>
++#include <QtTest>
++
++class tst_PressedOutsideNotifier: public GestureTest
++{
++    Q_OBJECT
++public:
++    tst_PressedOutsideNotifier();
++private Q_SLOTS:
++    void init(); // called right before each and every test function is executed
++
++    void touchOutsideAreaTriggersSignal();
++    void touchInsideAreaHasNoEffect();
++    void mousePressOutsideAreaTriggersSignal();
++    void mousePresssInsideAreaHasNoEffect();
++    void nothingHappensWhileDisabled();
++
++private:
++    QQuickItem *m_blueRect;
++    PressedOutsideNotifier *m_notifier;
++};
++
++tst_PressedOutsideNotifier::tst_PressedOutsideNotifier()
++    : GestureTest(QStringLiteral("tst_PressedOutsideNotifier.qml"))
++{
++}
++
++void tst_PressedOutsideNotifier::init()
++{
++    GestureTest::init();
++
++    m_blueRect = m_view->rootObject()->findChild<QQuickItem*>("blueRect");
++    Q_ASSERT(m_blueRect != nullptr);
++
++    m_notifier =
++        m_view->rootObject()->findChild<PressedOutsideNotifier*>("pressedOutsideNotifier");
++    Q_ASSERT(m_notifier != nullptr);
++}
++
++void tst_PressedOutsideNotifier::touchOutsideAreaTriggersSignal()
++{
++    // half-way towards the top-left corner of the blueRect.
++    // Therefore, still outside it.
++    QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
++
++    QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
++
++    QTest::touchEvent(m_view, m_device)
++        .press(0, touch0);
++
++    qApp->processEvents();
++
++    QCOMPARE(pressedOutsideSpy.count(), 1);
++
++    QTest::touchEvent(m_view, m_device)
++        .release(0, touch0);
++}
++
++void tst_PressedOutsideNotifier::touchInsideAreaHasNoEffect()
++{
++    QPoint touch0 = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,
++                           m_blueRect->y() + m_blueRect->height()*0.5);
++
++    QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
++
++    QTest::touchEvent(m_view, m_device)
++        .press(0, touch0);
++
++    qApp->processEvents();
++
++    QCOMPARE(pressedOutsideSpy.count(), 0);
++
++    QTest::touchEvent(m_view, m_device)
++        .release(0, touch0);
++}
++
++void tst_PressedOutsideNotifier::mousePressOutsideAreaTriggersSignal()
++{
++    QPoint mousePos= QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
++
++    QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
++
++    QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
++
++    qApp->processEvents();
++
++    QCOMPARE(pressedOutsideSpy.count(), 1);
++
++    QTest::mouseRelease(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
++}
++
++void tst_PressedOutsideNotifier::mousePresssInsideAreaHasNoEffect()
++{
++    QPoint mousePos = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,
++                             m_blueRect->y() + m_blueRect->height()*0.5);
++
++    QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
++
++    QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
++
++    qApp->processEvents();
++
++    QCOMPARE(pressedOutsideSpy.count(), 0);
++
++    QTest::mouseRelease(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
++}
++
++void tst_PressedOutsideNotifier::nothingHappensWhileDisabled()
++{
++    QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
++
++    QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
++
++    m_notifier->setEnabled(false);
++
++    QTest::touchEvent(m_view, m_device)
++        .press(0, touch0);
++
++    qApp->processEvents();
++
++    QCOMPARE(pressedOutsideSpy.count(), 0);
++
++    QTest::touchEvent(m_view, m_device)
++        .release(0, touch0);
++}
++
++QTEST_MAIN(tst_PressedOutsideNotifier)
++
++#include "tst_PressedOutsideNotifier.moc"
 === added file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
 --- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2013-11-29 11:22:23 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2013 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
++
++/*
++  NB: If you change positions or sizes here make sure
++      tst_PressedOutsideNotifier.cpp is updated accordingly
++ */
++
++Rectangle {
++    width: units.gu(60)
++    height: units.gu(60)
++    color: "white"
++
++    Rectangle {
++        id: blueRect
++        objectName: "blueRect"
++        color: "blue"
++        x: units.gu(20)
++        y: units.gu(20)
++        width: units.gu(20)
++        height: units.gu(20)
++
++        Timer {
++            id: resetColorTimer
++            interval: 300
++            repeat: false
++            onTriggered: {
++                blueRect.color = "blue";
++            }
++        }
++
++        function blinkRed() {
++            blueRect.color = "red";
++            resetColorTimer.start();
++        }
++
++        PressedOutsideNotifier {
++            objectName: "pressedOutsideNotifier"
++            anchors.fill: parent
++            onPressedOutside: {
++                blueRect.blinkRed();
++            }
++        }
++    }
++}
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2013-11-19 09:43:35 +0000
 +++ tests/qmltests/CMakeLists.txt	2013-11-29 11:22:23 +0000
@@ -46,7 +46,9 @@
  add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
  add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
                                             ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
++add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
++                                                            ${CMAKE_BINARY_DIR}/tests/mocks
++                                                            ${CMAKE_BINARY_DIR}/plugins)
  add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
 === modified file 'tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml'
 --- tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2013-10-25 07:59:15 +0000
 +++ tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2013-11-29 11:22:23 +0000
@@ -239,5 +239,25 @@
              return findChild(runningApplicationsGrid, "runningAppTile Calendar")
                      != undefined
+         }
++
++        // While in termination mode, if you click outside any of the tiles, the
++        // termination mode is disabled (i.e. we switch back to activation mode).
++        function test_clickOutsideTilesDisablesTerminationMode() {
++            runningApplicationsGrid.terminationModeEnabled = true
++
++            var calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")
++            verify(calendarTile != undefined)
++
++            verify(runningApplicationsGrid.terminationModeEnabled);
++
++            // Click on the bottom right corner of the grid, where there's no
++            // RunningApplicationTile lying around
++            mouseClick(runningApplicationsGrid,
++                       runningApplicationsGrid.width - 1, runningApplicationsGrid.height - 1);
++
++            wait(0) // spin event loop to ensure that any pending signal emission went through
++
++            verify(!runningApplicationsGrid.terminationModeEnabled);
++        }
+     }
+ }