@@ -52,15 +52,20 @@ Rectangle {
5252 application: fakeApplication
5353 }
5454 }
55− Loader {
56− id: applicationWindowLoader
55+ FocusScope {
56+ id: appFocus
5757 anchors {
5858 top: parent.top
5959 bottom: parent.bottom
6060 left: parent.left
6161 }
6262 width: units.gu(40)
63− sourceComponent: applicationWindowComponent
63+
64+ Loader {
65+ id: applicationWindowLoader
66+ anchors.fill: parent
67+ sourceComponent: applicationWindowComponent
68+ }
6469 }
6570
6671 Rectangle {
@@ -68,7 +73,7 @@ Rectangle {
6873 anchors {
6974 top: parent.top
7075 bottom: parent.bottom
71− left: applicationWindowLoader.right
76+ left: appFocus.right
7277 right: parent.right
7378 }
7479
@@ -378,5 +383,16 @@ Rectangle {
378383
379384 verify(stateGroup.state === "void");
380385 }
386+
387+ // should be forcing active focus when interactive changes,
388+ // which will cause a FocusScope higher in the object hierarchy tp be given the focus
389+ function test_forceActiveFocusFollowsInterative() {
390+ fakeApplication.createSession();
391+ applicationWindowLoader.item.interactive = false;
392+ applicationWindowLoader.item.interactive = true;
393+ fakeSession.createSurface();
394+
395+ compare(appFocus.focus, true);
396+ }
381397 }
382398}