Merge lp:~lukas-kde/unity8/doubleTapToMaximize into lp:unity8

[Lukáš Tinkl]

Restore the double tap decoration to maximize feature

Restore the double tap decoration to maximize feature

* Are there any related MPs required for this MP to build/function as expected? Please list.

yes, the prereq

 * 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?

n/a

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

PASSED: Continuous integration, rev:2589
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2258/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2972
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1638
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1638
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1638
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3000
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2858/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2858
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2858/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

I really dislike that MoveHandler does all this random stuff on "target" without there being any sort of defined API in between. This needs refactoring at some point.

I think we need to define a WindowDelegate component with a proper API on all the things that the MoveHandler and DecoratedWindow access. So that we can also supply mocked WindowDelegates to tests etc (DecoratedWindow tests spit an infinite amount of warnings atm).

That said, I think this fix is still OK for now.

review: Approve

[lp:~lukas-kde/unity8/doubleTapToMaximize]

2590. By Lukáš Tinkl on 2016-09-29

merge prereq

[Michael Zanetti (mzanetti)]

ok, tested it on the M10. looking ok.

review: Approve

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

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

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

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/doubleTapToMaximize]

2591. By Lukáš Tinkl on 2016-10-05

fix the fake rectangle ghost

2592. By Lukáš Tinkl on 2016-10-05

merge prereq

2593. By Lukáš Tinkl on 2016-10-06

merge prereq, fix conflicts

=== modified file 'qml/Stage/MoveHandler.qml'
--- qml/Stage/MoveHandler.qml	2016-10-06 11:13:27 +0000
+++ qml/Stage/MoveHandler.qml	2016-10-06 11:13:28 +0000
@@ -103,7 +103,8 @@
         if (priv.dragging) {
             Mir.cursorName = "grabbing";
 
-            if (target.anyMaximized) { // restore from maximized when dragging away from edges/corners
+            // restore from maximized when dragging away from edges/corners; guard against inadvertent changes when going into maximized state
+            if (target.anyMaximized && !target.windowedTransitionRunning) {
                 priv.progress = 0;
                 target.restore(false, WindowStateStorage.WindowStateNormal);
             }

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2016-10-06 11:13:27 +0000
+++ qml/Stage/Stage.qml	2016-10-06 11:13:28 +0000
@@ -716,6 +716,7 @@
                 readonly property string appName: model.application ? model.application.name : ""
                 property bool visuallyMaximized: false
                 property bool visuallyMinimized: false
+                readonly property alias windowedTransitionRunning: windowedTransition.running
 
                 property int stage: ApplicationInfoInterface.MainStage
                 function saveStage(newStage) {
@@ -1167,7 +1168,7 @@
                         }
                     },
                     State {
-                        name: "maximized"; when: appDelegate.windowState == WindowStateStorage.WindowStateMaximized
+                        name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
                         PropertyChanges {
                             target: appDelegate;
                             requestedX: root.leftMargin;
@@ -1307,7 +1308,7 @@
                         UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,opacity,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
                     },
                     Transition {
-                        from: "normal,maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedBottomLeft,maximizedTopRight,maximizedBottomRight";
+                        from: "normal,restored,maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedBottomLeft,maximizedTopRight,maximizedBottomRight";
                         to: "staged,stagedWithSideStage"
                         UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
                     },
@@ -1384,6 +1385,7 @@
                         }
                     },
                     Transition {
+                        id: windowedTransition
                         from: "normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTop,maximizedBottom,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
                         to: "normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTop,maximizedBottom,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
                         enabled: appDelegate.animationsEnabled

=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2016-10-06 11:13:27 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2016-10-06 11:13:28 +0000
@@ -772,5 +772,21 @@
 
             tryCompare(mouseEaterSpy, "count", 0);
         }
+
+        // regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1627281
+        function test_doubleTapToMaximizeWindow() {
+            var dialerAppDelegate = startApplication("dialer-app");
+            verify(dialerAppDelegate);
+            var decoration = findChild(dialerAppDelegate, "appWindowDecoration");
+            verify(decoration);
+
+            // simulate a double tap, with a slight erroneous move in between those 2 taps
+            tap(decoration);
+            touchPress(decoration);
+            touchMove(decoration, decoration.width/2, decoration.height/2 - 10)
+            touchRelease(decoration);
+
+            tryCompare(dialerAppDelegate, "state", "maximized");
+        }
     }
 }