Merge lp:~dandrader/unity8/childWindowFocus into lp:unity8

[Daniel d'Andrada]

Give active focus to child surface qml items

Prereq-archive: ppa:ci-train-ppa-service/2555

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/qtmir/keyState/+merge/320930

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

* If you changed the UI, has there been a design review?
Not applicable

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

FAILED: Continuous integration, rev:2869
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3416/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4503
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2704
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2704
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4531
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4358
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4358
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4358
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4358
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4358
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4358
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4358/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Looks like DesktopStage::test_smashCursorKeys is failing consistently in CI

review: Needs Fixing

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

FAILED: Continuous integration, rev:2870
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3419/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4507/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4535
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4362/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4362/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4362/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4362/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4362/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4362/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2870
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3420/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4508/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4536
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4363/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4363/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4363/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4363/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4363/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4363/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2870
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3425/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4517
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2716
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2716
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4545
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4372
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4372/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4372
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4372/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4372
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4372/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4372
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4372/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4372
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4372/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4372
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4372/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

So the exectution of that new DesktopStage::test_childWindowGetsActiveFocus test somehow affects the environment, causing DesktopStage::test_smashCursorKeys to fail minimizing its apps.

[Daniel d'Andrada (dandrader)]

> Looks like DesktopStage::test_smashCursorKeys is failing consistently in CI

It was a problem in the mock MirSurface. Tests should pass now.

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

FAILED: Continuous integration, rev:2871
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3426/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4518
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2717
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4546
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4373
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4373/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4373
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4373/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4373
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4373/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4373
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4373/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4373
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4373/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4373
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4373/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2871
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3432/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4524
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2722
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2722
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4552
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4379
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4379/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4379
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4379/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4379
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4379/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4379
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4379/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4379
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4379/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4379
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4379/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Generally works nice with one exception: child windows opened as a result of a menu click do not take focus. I'm not going to block you on this as the menubar has focus issues on its own but do you think you could look into that too? Otherwise let's just leave it for another branch

review: Needs Information

[Daniel d'Andrada (dandrader)]

On 17/03/2017 11:27, Lukáš Tinkl wrote:
> Review: Needs Information
>
> Generally works nice with one exception: child windows opened as a result of a menu click do not take focus. I'm not going to block you on this as the menubar has focus issues on its own but do you think you could look into that too? Otherwise let's just leave it for another branch

It did work here.

And yes, I would fix focus hanlding when menus come and go in a separate
branch.

[Lukáš Tinkl (lukas-kde)]

Ok, but I just found a bigger issue though:

1. Launch kate
2. Press Ctrl+O or click the Open... toolbar button
3. Press Esc to close the file dialog
(4. The focus is gone but that's a separate issue indeed)
5. Manually activate the main kate window (e.g. click decoration)
6. Notice you can't _anything_ type anymore in the kate window
7. Press "O" alone, notice the file dialog gets opened again

Seems like the Ctrl key gets stuck somewhere

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 17/03/2017 11:54, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Ok, but I just found a bigger issue though:
>
> 1. Launch kate
> 2. Press Ctrl+O or click the Open... toolbar button
> 3. Press Esc to close the file dialog
> (4. The focus is gone but that's a separate issue indeed)
> 5. Manually activate the main kate window (e.g. click decoration)
> 6. Notice you can't _anything_ type anymore in the kate window
> 7. Press "O" alone, notice the file dialog gets opened again
>
> Seems like the Ctrl key gets stuck somewhere

Added a qtmir branch to fix that. But it seems there's also work needed
on mir itself as well, which is out of my domain.

[Daniel d'Andrada (dandrader)]

Updated the qtmir branch. That "Ctrl+O + Esc + O" use case in kate should work now.

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

PASSED: Continuous integration, rev:2891
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3496/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4622
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2800
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2800
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4650
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4478
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4478/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4478
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4478/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4478
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4478/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4478
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4478/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4478
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4478/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4478
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4478/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Works great now with lp:~dandrader/qtmir/keyState!

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

yes

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

yes

review: Approve

=== modified file 'qml/Stage/ChildWindow.qml'
--- qml/Stage/ChildWindow.qml	2017-02-22 15:12:17 +0000
+++ qml/Stage/ChildWindow.qml	2017-03-22 18:52:10 +0000
@@ -18,8 +18,9 @@
 import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
-Item {
+FocusScope {
     id: root
+    objectName: "childWindow"
 
     // Set from outside.
     property var surface
@@ -141,6 +142,8 @@
         // TODO ChildWindow parent will probably want to control those
         interactive: true
         consumesInput: true
+
+        focus: true
     }
 
     Loader {

=== modified file 'qml/Stage/ChildWindowRepeater.qml'
--- qml/Stage/ChildWindowRepeater.qml	2017-01-26 11:10:01 +0000
+++ qml/Stage/ChildWindowRepeater.qml	2017-03-22 18:52:10 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2016-2017 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
@@ -21,8 +21,19 @@
     id: root
     property Item boundsItem
     delegate: ChildWindowTree {
+        id: childWindowTree
         surface: model.surface
         z: root.count - model.index
         boundsItem: root.boundsItem
+        Connections {
+            target: childWindowTree.surface
+            onFocusedChanged: {
+                if (childWindowTree.surface.focused) {
+                    childWindowTree.focus = true;
+                    // focus the Loader
+                    childWindowTree.parent.focus = true;
+                }
+            }
+        }
     }
 }

=== modified file 'qml/Stage/ChildWindowTree.qml'
--- qml/Stage/ChildWindowTree.qml	2017-03-22 18:52:09 +0000
+++ qml/Stage/ChildWindowTree.qml	2017-03-22 18:52:10 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2016-2017 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
@@ -18,7 +18,7 @@
 import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
-Item {
+FocusScope {
     id: root
 
     property alias surface: childWindow.surface
@@ -100,6 +100,13 @@
         onFocusRequested: {
             root.surface.activate();
         }
+        onFocusedChanged: {
+            if (root.surface.focused) {
+                childWindow.focus = true;
+                // Propagate
+                root.focus = true;
+            }
+        }
     }
 
     // Using a loader here mainly to circunvent the "ChildWindowTree is instantiated recursively" error from the QML engine
@@ -119,5 +126,12 @@
             property: "boundsItem"
             value: root.boundsItem
         }
+        onFocusChanged: {
+            if (focus) {
+                // A surface in some ChildWindowTree got focused.
+                // Propagate
+                root.focus = true;
+            }
+        }
     }
 }

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-03-22 18:52:09 +0000
+++ qml/Stage/Stage.qml	2017-03-22 18:52:10 +0000
@@ -899,12 +899,13 @@
                         priv.updateMainAndSideStageIndexes();
                     }
                     appDelegate.focus = true;
+                    priv.focusedAppDelegate = appDelegate;
                 }
 
                 function updateQmlFocusFromMirSurfaceFocus() {
                     if (model.window.focused) {
                         claimFocus();
-                        priv.focusedAppDelegate = appDelegate;
+                        decoratedWindow.focus = true;
                     }
                 }
 
@@ -1807,6 +1808,14 @@
                             boundsItem: boundariesForWindowPlacement
 
                             z: childWindowRepeater.count - model.index
+
+                            onFocusChanged: {
+                                if (focus) {
+                                    // some child surface in this tree got focus.
+                                    // Ensure we also have it at the top-level hierarchy
+                                    appDelegate.claimFocus();
+                                }
+                            }
                         }
                     }
                 }

=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
--- tests/mocks/Unity/Application/MirSurface.cpp	2017-03-22 18:52:09 +0000
+++ tests/mocks/Unity/Application/MirSurface.cpp	2017-03-22 18:52:10 +0000
@@ -452,6 +452,11 @@
 void MirSurface::close()
 {
     DEBUG_MSG("");
+
+    for (int i = 0; i < m_childSurfaceList->count(); ++i) {
+        m_childSurfaceList->get(i)->close();
+    }
+
     if (!m_zombieTimer.isActive()) {
         m_zombieTimer.start();
         Q_EMIT closeRequested();

=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2017-03-08 09:53:21 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-03-22 18:52:10 +0000
@@ -1057,5 +1057,15 @@
             tap(maxButton);
             tryCompare(appDelegate, "state", "maximized");
         }
+
+        function test_childWindowGetsActiveFocus() {
+            var appDelegate = startApplication("kate");
+            appDelegate.surface.openDialog(units.gu(5), units.gu(5), units.gu(30), units.gu(30));
+            var childWindow = findChild(appDelegate, "childWindow");
+            verify(childWindow);
+            var surfaceItem = findChild(childWindow, "surfaceItem");
+            verify(surfaceItem);
+            tryCompare(surfaceItem, "activeFocus", true);
+        }
     }
 }