Merge lp:~azzar1/unity8/dragging-cursor-on-first-press into lp:unity8

[Andrea Azzarone]

Set Mir.cursorName to "grabbing" on first mouse press on a window decoration. Don't wait for press+motion.

* Are there any related MPs required for this MP to build/function as expected?
Yes, lp:~mzanetti/unity8/unified-stages but it's merged and listed as prerequisite.

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

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

 * If you changed the UI, has there been a design review?
Not a visual change. The behavior is now similar to unity7 and all major DEs.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2602
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2053/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2697
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1484
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1484
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1484
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2725
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2598
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2598
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2598
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2591/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2591
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2591/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2053/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

It doesn't work correctly when you double-click the decoration (to maximize the window)

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2603
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2063/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2063/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

Fixed!

[Albert Astals Cid (aacid)]

Text conflict in qml/Stages/WindowDecoration.qml
1 conflicts encountered.

Also, should we have a test?

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Text conflict in qml/Stages/WindowDecoration.qml
> 1 conflicts encountered.
>
> Also, should we have a test?

Yeah I tried to add a test but asserting for Mir.Cursor does not work.

[Albert Astals Cid (aacid)]

> > Text conflict in qml/Stages/WindowDecoration.qml
> > 1 conflicts encountered.
> >
> > Also, should we have a test?
>
> Yeah I tried to add a test but asserting for Mir.Cursor does not work.

What do you mean it does not work?

[Andrea Azzarone (azzar1)]

> > > Text conflict in qml/Stages/WindowDecoration.qml
> > > 1 conflicts encountered.
> > >
> > > Also, should we have a test?
> >
> > Yeah I tried to add a test but asserting for Mir.Cursor does not work.
>
> What do you mean it does not work?

Mir.cursorName is always "undefined" when running tests. Likely it requires a Mir session.

[Albert Astals Cid (aacid)]

Conflicts with https://code.launchpad.net/~mzanetti/unity8/unified-stages/+merge/305588

Given how unified-stages is our focus on landing ASAP i'd suggest you rebase on top of it.

[Albert Astals Cid (aacid)]

> Mir.cursorName is always "undefined" when running tests. Likely it requires a
> Mir session.

No, it does not, Mir.cursorName in "real life" is provided by qtmir's Unity.Application plugin (./src/modules/Unity/Application/plugin.cpp), what we need is update our mock plugin tests/mocks/Unity/Application so that it provides a "Mir" object that is in line with what the real world one does.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2605
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2334/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3072
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1718
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1718
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1718
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3100
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2957/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2957
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2957/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2334/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2607
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2421/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3175
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1812
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1812
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1812
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3203
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3059/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3059
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3059/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2421/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Should we remove the

qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values, it can't be instantiated");

line from the mock plugin.cpp?

Declaring Mir both a singleton an uncreatable is a bit weird, no?

review: Needs Information

[Andrea Azzarone (azzar1)]

> Should we remove the
>
> qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values,
> it can't be instantiated");
>
> line from the mock plugin.cpp?
>
> Declaring Mir both a singleton an uncreatable is a bit weird, no?

Fixed thanks.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2609
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2422/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3176
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1813
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1813
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1813
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3204
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3060/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3060
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3060/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2422/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Code looks good.

BUT

When i use it on my computer i don't get a dragging icon at all and terminal says

[2016-10-14:12:19:38.650] CursorImageProvider: "grabbing" not found (nor its fallbacks, if any). Going for "left_ptr" as a last resort.

This is a realtively clean user and a relatively new install.

Any idea what may be wrong?

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

Worked fine here, just tested it

Only wondering where does this magic constant "175" for the timer coming from? :)

review: Approve

[Andrea Azzarone (azzar1)]

> Worked fine here, just tested it
>
> Only wondering where does this magic constant "175" for the timer coming from?
> :)

It's the same we have in unity7.

[Lukáš Tinkl (lukas-kde)]

OK, no objections from me then :)

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/Stage/tst_DesktopStage.qml
1 conflicts encountered.

Note: Was already top approved

review: Needs Fixing

[lp:~azzar1/unity8/dragging-cursor-on-first-press]

2610. By Andrea Azzarone on 2016-10-28

Merge with trunk and resolve conflicts.

[Andrea Azzarone (azzar1)]

> Text conflict in tests/qmltests/Stage/tst_DesktopStage.qml
> 1 conflicts encountered.
>
> Note: Was already top approved

Fixed.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2610
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2457/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3231
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1853
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1853
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1853
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3259
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3113/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3113
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3113/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2457/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

review: Abstain

=== modified file 'qml/Stage/MoveHandler.qml'
--- qml/Stage/MoveHandler.qml	2016-09-27 15:03:00 +0000
+++ qml/Stage/MoveHandler.qml	2016-10-28 12:29:16 +0000
@@ -54,6 +54,11 @@
         property bool nearBottomLeftCorner: target.maximizedBottomLeft
         property bool nearBottomRightCorner: target.maximizedBottomRight
 
+        property Timer mouseDownTimer: Timer {
+            interval: 175
+            onTriggered: Mir.cursorName = "grabbing"
+        }
+
         function resetEdges() {
             nearLeftEdge = false;
             nearRightEdge = false;
@@ -93,14 +98,17 @@
             }
 
             priv.dragging = true;
+            priv.mouseDownTimer.start();
         } else {
             priv.dragging = false;
+            priv.mouseDownTimer.stop();
             Mir.cursorName = "";
         }
     }
 
     function handlePositionChanged(mouse, sensingPoints) {
         if (priv.dragging) {
+            priv.mouseDownTimer.stop();
             Mir.cursorName = "grabbing";
 
             // restore from maximized when dragging away from edges/corners; guard against inadvertent changes when going into maximized state

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2016-06-30 13:51:32 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2016-10-28 12:29:16 +0000
@@ -5,6 +5,7 @@
     MirSurface.cpp
     MirSurfaceItem.cpp
     MirSurfaceListModel.cpp
+    MirMock.cpp
     ObjectListModel.h
     SurfaceManager.cpp
     VirtualKeyboard.cpp

=== added file 'tests/mocks/Unity/Application/MirMock.cpp'
--- tests/mocks/Unity/Application/MirMock.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirMock.cpp	2016-10-28 12:29:16 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 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 "MirMock.h"
+
+MirMock *MirMock::the_mir = nullptr;
+
+MirMock *MirMock::instance()
+{
+    return the_mir;
+}
+
+MirMock::MirMock()
+{
+    Q_ASSERT(the_mir == nullptr);
+    the_mir = this;
+}
+
+MirMock::~MirMock()
+{
+    Q_ASSERT(the_mir == this);
+    the_mir = nullptr;
+}
+
+void MirMock::setCursorName(const QString &cursorName)
+{
+    if (cursorName != m_cursorName) {
+        m_cursorName = cursorName;
+        Q_EMIT cursorNameChanged(m_cursorName);
+    }
+}
+
+QString MirMock::cursorName() const
+{
+    return m_cursorName;
+}

=== added file 'tests/mocks/Unity/Application/MirMock.h'
--- tests/mocks/Unity/Application/MirMock.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirMock.h	2016-10-28 12:29:16 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016 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 MIR_MOCK_H
+#define MIR_MOCK_H
+
+#include <unity/shell/application/Mir.h>
+
+class MirMock : public ::Mir
+{
+    Q_OBJECT
+public:
+    explicit MirMock();
+    virtual ~MirMock();
+
+    static MirMock *instance();
+
+    void setCursorName(const QString &cursorName) override;
+    QString cursorName() const override;
+
+private:
+    static MirMock *the_mir;
+    QString m_cursorName;
+};
+
+#endif

=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
--- tests/mocks/Unity/Application/plugin.cpp	2016-06-30 13:51:32 +0000
+++ tests/mocks/Unity/Application/plugin.cpp	2016-10-28 12:29:16 +0000
@@ -17,6 +17,7 @@
 #include "plugin.h"
 #include "ApplicationInfo.h"
 #include "ApplicationManager.h"
+#include "MirMock.h"
 #include "MirSurfaceItem.h"
 #include "SurfaceManager.h"
 
@@ -38,6 +39,9 @@
     if (!SurfaceManager::instance()) {
         new SurfaceManager;
     }
+    if (!MirMock::instance()) {
+        new MirMock;
+    }
 }
 
 QObject* applicationManagerSingleton(QQmlEngine*, QJSEngine*)
@@ -46,6 +50,12 @@
     return new ApplicationManager;
 }
 
+QObject* mirSingleton(QQmlEngine*, QJSEngine*)
+{
+    createUnityApplicationSharedSingletons();
+    return MirMock::instance();
+}
+
 QObject* surfaceManagerSingleton(QQmlEngine*, QJSEngine*)
 {
     createUnityApplicationSharedSingletons();
@@ -78,9 +88,8 @@
     qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
 
     qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
+    qmlRegisterSingletonType<MirMock>(uri, 0, 1, "Mir", mirSingleton);
     qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
-
-    qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values, it can't be instantiated");
 }
 
 void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2016-09-27 15:03:00 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2016-10-28 12:29:16 +0000
@@ -788,5 +788,21 @@
 
             tryCompare(dialerAppDelegate, "state", "maximized");
         }
+
+        function test_grabbingCursorOnDecorationPress() {
+            var appDelegate = startApplication("dialer-app");
+            verify(appDelegate);
+            var decoration = findChild(appDelegate, "appWindowDecoration");
+            verify(decoration);
+
+            mousePress(decoration, decoration.width/2, decoration.height/2, Qt.LeftButton);
+            tryCompare(Mir, "cursorName", "grabbing");
+
+            mouseMove(decoration, decoration.width/2 + 1, decoration.height/2 + 1);
+            tryCompare(Mir, "cursorName", "grabbing");
+
+            mouseRelease(decoration);
+            tryCompare(Mir, "cursorName", "");
+        }
     }
 }