Merge lp:~josharenson/unity8/fix_trust_store_focus into lp:unity8

[Josh Arenson]

Return focus to the application after a tusted session overlay is closing.

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

 * 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

Fix lp:1381292

This works around an issue where a trusted session dialog would steal focus from an underlying application/session and never return it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/unity8-ci/4759/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1853
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7457
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15054

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

With the current way we're doing focus I guess this is the way to go, not really a hack. What is the reason why you think this is a hack? What would you say is the proper fix?

I guess I'm fine with approving this, maybe we can even remove the FIXME comment.

review: Needs Information

[Josh Arenson (josharenson)]

> With the current way we're doing focus I guess this is the way to go, not
> really a hack. What is the reason why you think this is a hack? What would you
> say is the proper fix?
>
> I guess I'm fine with approving this, maybe we can even remove the FIXME
> comment.

If focus worked correctly, this wouldn't be a hack. I'll remove the FIXME because any focus changes we make should work with this anyway.

[lp:~josharenson/unity8/fix_trust_store_focus]

1371. By Josh Arenson on 2014-11-12

Remove FIXME

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4876/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/41
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/138
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15715

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4877/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/139
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15716

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

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

yep

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

it did

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

yeah

review: Approve

=== modified file 'qml/Stages/SessionContainer.qml'
--- qml/Stages/SessionContainer.qml	2014-10-01 13:20:32 +0000
+++ qml/Stages/SessionContainer.qml	2014-11-12 01:10:20 +0000
@@ -69,6 +69,10 @@
                 target: item; when: item
                 property: "orientation"; value: root.orientation
             }
+
+            Component.onDestruction: {
+                root.session.surface.forceActiveFocus();
+            }
         }
     }
 
 
=== modified file 'tests/mocks/Unity/Application/Session.h'
--- tests/mocks/Unity/Application/Session.h	2014-09-01 16:07:55 +0000
+++ tests/mocks/Unity/Application/Session.h	2014-11-12 01:10:20 +0000
@@ -56,7 +56,7 @@
 
     Q_INVOKABLE void addChildSession(Session* session);
     void insertChildSession(uint index, Session* session);
-    void removeChildSession(Session* session);
+    Q_INVOKABLE void removeChildSession(Session* session);
 
 Q_SIGNALS:
     void applicationChanged(ApplicationInfo*);
 
=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
--- tests/qmltests/Stages/tst_SessionContainer.qml	2014-09-12 18:09:44 +0000
+++ tests/qmltests/Stages/tst_SessionContainer.qml	2014-11-12 01:10:20 +0000
@@ -185,6 +185,41 @@
             tryCompare(sessionSpy, "count", data.count);
         }
 
+        function test_childSessionDestructionReturnsFocusToSiblingOrParent() {
+            sessionCheckbox.checked = true;
+            var sessionContainer = sessionContainerLoader.item;
+            compare(sessionContainer.childSessions.count(), 0);
+
+            sessionContainer.interactive = true;
+
+            var i;
+            var sessions = [];
+            // 3 sessions should cover all edge cases
+            for(i = 0; i < 3; i++) {
+                var a_session = ApplicationTest.addChildSession(
+                    sessionContainer.session, "gallery"
+                )
+
+                a_session.createSurface();
+                sessionContainer.session.addChildSession(a_session);
+                compare(sessionContainer.childSessions.count(), i + 1);
+
+                sessions.push(a_session);
+            }
+
+            var a_session;
+            while(a_session = sessions.pop()) {
+                a_session.surface.forceActiveFocus();
+                compare(a_session.surface.activeFocus, true);
+
+                var parentSession = a_session.parentSession;
+                sessionContainer.session.removeChildSession(a_session);
+                compare(a_session.surface.activeFocus, false);
+
+                compare(parentSession.surface.activeFocus, true);
+            }
+        }
+
         function test_nestedChildSessions_data() {
             return [ { tag: "depth=2", depth: 2 },
                      { tag: "depth=8", depth: 8 }