git.iko.soy/unity8
on xenial help sign in
merge albert's test and add some more focus fixes
98e912cMichael Zanetti
qml/Stage/Stage.qml+7
compare with xenial
unifiedsplit
@@ -91,6 +91,7 @@ FocusScope {
91
91
92
92
93 onAltTabPressedChanged: {
93 onAltTabPressedChanged: {
94+ root.focus = true;
94 if (altTabPressed) {
95 if (altTabPressed) {
95 if (root.spreadEnabled) {
96 if (root.spreadEnabled) {
96 altTabDelayTimer.start();
97 altTabDelayTimer.start();
@@ -517,14 +518,20 @@ FocusScope {
517 State {
518 State {
518 name: "staged"; when: root.mode === "staged"
519 name: "staged"; when: root.mode === "staged"
519 PropertyChanges { target: wallpaper; visible: !priv.focusedAppDelegate || priv.focusedAppDelegate.x !== 0 }
520 PropertyChanges { target: wallpaper; visible: !priv.focusedAppDelegate || priv.focusedAppDelegate.x !== 0 }
521+ PropertyChanges { target: root; focus: true }
522+ PropertyChanges { target: appContainer; focus: true }
520 },
523 },
521 State {
524 State {
522 name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
525 name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
523 PropertyChanges { target: triGestureArea; enabled: priv.sideStageEnabled }
526 PropertyChanges { target: triGestureArea; enabled: priv.sideStageEnabled }
524 PropertyChanges { target: sideStage; visible: true }
527 PropertyChanges { target: sideStage; visible: true }
528+ PropertyChanges { target: root; focus: true }
529+ PropertyChanges { target: appContainer; focus: true }
525 },
530 },
526 State {
531 State {
527 name: "windowed"; when: root.mode === "windowed"
532 name: "windowed"; when: root.mode === "windowed"
533+ PropertyChanges { target: root; focus: true }
534+ PropertyChanges { target: appContainer; focus: true }
528 }
535 }
529 ]
536 ]
530 transitions: [
537 transitions: [
tests/qmltests/tst_Shell.qml+3−1
@@ -3218,6 +3218,8 @@ Rectangle {
3218 var appDelegate = startApplication("gmail-webapp");
3218 var appDelegate = startApplication("gmail-webapp");
3219 var appDelegate2 = startApplication("dialer-app");
3219 var appDelegate2 = startApplication("dialer-app");
3220
3220
3221+ tryCompare(appDelegate2.surface, "activeFocus", true);
3222+
3221 var maximizeButton = findChild(appDelegate2, "maximizeWindowButton");
3223 var maximizeButton = findChild(appDelegate2, "maximizeWindowButton");
3222 mouseClick(maximizeButton);
3224 mouseClick(maximizeButton);
3223 tryCompare(appDelegate2, "state", "maximized");
3225 tryCompare(appDelegate2, "state", "maximized");
@@ -3242,7 +3244,7 @@ Rectangle {
3242 if (data.showSpread) {
3244 if (data.showSpread) {
3243 tryCompare(stage, "spreadShown", true);
3245 tryCompare(stage, "spreadShown", true);
3244 }
3246 }
3245− tryCompareFunction(function() { return menuBarLoader.active === false; }, true);
3247+ tryCompare(panelMenuItem, "__popup", null);
3246 keyRelease(Qt.Key_Alt)
3248 keyRelease(Qt.Key_Alt)
3247
3249
3248 tryCompare(appDelegate.surface, "activeFocus", true);
3250 tryCompare(appDelegate.surface, "activeFocus", true);