Merge lp:~aacid/unity8/restoreFocusOnDialogClose into lp:unity8

[Albert Astals Cid]

Restore focus to where it was when our ShellDialogs get unloaded

UITK Dialogs want to have this feature but it seems to be broken, so i'm fixing it here first (since we use dialogs in a kind of special way)
I'll try to fix UITK next

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

 * 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

[lp:~aacid/unity8/restoreFocusOnDialogClose]

2684. By Albert Astals Cid on 2017-01-05

Component -> Item

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

PASSED: Continuous integration, rev:2684
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2828/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3701
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2125
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2125
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3729
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3573/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

I tested it slightly differently:
- with make tryOrientedShell
- set manta
- login
- open message indicator
- start replying to the message (gets focus)
- open power dialog
- click cancel
- focus gets back to the message (good)
- open power dialog
- click cancel

focus is gone apparently. Is it supposed to behave like that? am I doing sth wrong?

review: Needs Information

[Andrea Cimitan (cimi)]

Tested on a real session, the focus is lost after second dialog appears

review: Needs Fixing

[lp:~aacid/unity8/restoreFocusOnDialogClose]

2685. By Albert Astals Cid on 2017-01-09

Make it work the second time

[Andrea Cimitan (cimi)]

Last revision fixes the bug, Waiting CI

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

FAILED: Continuous integration, rev:2685
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2853/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3731
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2149/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2149
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3759
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3603
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3603/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3603
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3603/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3603
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3603/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3603
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3603/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3603
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3603/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3603
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3603/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Ci failed on jenkins itself failing, i've retriggered a build

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

PASSED: Continuous integration, rev:2685
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2859/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3737
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2155
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2155
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3765
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3609
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3609/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3609
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3609/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3609
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3609/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3609
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3609/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3609
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3609/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3609
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3609/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
y

review: Approve

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2017-01-09 15:58:33 +0000
+++ qml/Components/Dialogs.qml	2017-01-09 15:58:33 +0000
@@ -149,6 +149,25 @@
         objectName: "dialogLoader"
         anchors.fill: parent
         active: false
+        onActiveChanged: {
+            if (!active) {
+                if (previousFocusedItem) {
+                    previousFocusedItem.forceActiveFocus(Qt.OtherFocusReason);
+                    previousFocusedItem = undefined;
+                }
+                previousSourceComponent = undefined;
+                sourceComponent = undefined;
+            }
+        }
+        onSourceComponentChanged: {
+            if (previousSourceComponent !== sourceComponent) {
+                previousSourceComponent = sourceComponent;
+                previousFocusedItem = window.activeFocusItem;
+            }
+        }
+
+        property var previousSourceComponent: undefined
+        property var previousFocusedItem: undefined
     }
 
     Component {

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2017-01-09 15:58:33 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2017-01-09 15:58:33 +0000
@@ -1596,5 +1596,40 @@
 
             tryCompare(dialogLoader, "item", null);
         }
+
+        function test_focusOnShutdownDialogClose() {
+            loadShell("manta");
+            usageModeSelector.selectWindowed();
+
+            var surfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("twitter-webapp");
+            waitUntilAppWindowIsFullyLoaded(surfaceId);
+
+            var primaryAppWindow = findAppWindowForSurfaceId(surfaceId);
+            var surface = app.surfaceList.get(0);
+            var surfaceItem = findSurfaceItem(primaryAppWindow, surface);
+
+            compare(window.activeFocusItem, surfaceItem);
+
+            testCase.showPowerDialog();
+
+            var dialogLoader = findChild(orientedShell, "dialogLoader");
+            tryCompareFunction(function() { return dialogLoader.item !== null }, true);
+
+            keyClick(Qt.Key_Escape);
+
+            tryCompare(dialogLoader, "item", null);
+            compare(window.activeFocusItem, surfaceItem);
+
+            // Do it twice, our previous solution failed the second time ^_^
+            testCase.showPowerDialog();
+
+            tryCompareFunction(function() { return dialogLoader.item !== null }, true);
+
+            keyClick(Qt.Key_Escape);
+
+            tryCompare(dialogLoader, "item", null);
+            compare(window.activeFocusItem, surfaceItem);
+        }
     }
 }