git.iko.soy/unity8
on xenial help sign in
fix focusing next item in the chain
ee98fbfLukáš Tinkl
qml/Stages/PhoneStage.qml+2−1
compare with xenial
unifiedsplit
@@ -109,8 +109,9 @@ AbstractStage {
109 }
109 }
110
110
111 function closeFocusedDelegate() {
111 function closeFocusedDelegate() {
112− if (priv.focusedAppDelegate && !priv.focusedAppDelegate.isDash) {
112+ if (priv.focusedAppDelegate && priv.focusedAppDelegate.closeable) {
113 priv.focusedAppDelegate.closed();
113 priv.focusedAppDelegate.closed();
114+ spreadRepeater.itemAt(1).focus = true; // focus the next one
114 }
115 }
115 }
116 }
116
117
qml/Stages/TabletStage.qml+2−1
@@ -85,8 +85,9 @@ AbstractStage {
85 }
85 }
86
86
87 function closeFocusedDelegate() {
87 function closeFocusedDelegate() {
88− if (priv.focusedAppDelegate && !priv.focusedAppDelegate.isDash) {
88+ if (priv.focusedAppDelegate && priv.focusedAppDelegate.closeable) {
89 priv.focusedAppDelegate.closed();
89 priv.focusedAppDelegate.closed();
90+ spreadRepeater.itemAt(1).focus = true; // focus the next one
90 }
91 }
91 }
92 }
92
93
tests/qmltests/tst_Shell.qml+2−1
@@ -2459,7 +2459,7 @@ Rectangle {
2459 return [
2459 return [
2460 { tag: "phone" },
2460 { tag: "phone" },
2461 { tag: "tablet" },
2461 { tag: "tablet" },
2462− { tag: "desktop" },
2462+ { tag: "desktop" }
2463 ]
2463 ]
2464 }
2464 }
2465
2465
@@ -2482,6 +2482,7 @@ Rectangle {
2482 keyClick(Qt.Key_F4, Qt.AltModifier);
2482 keyClick(Qt.Key_F4, Qt.AltModifier);
2483
2483
2484 tryCompare(topLevelSurfaceList, "count", countBeforeClose - 1);
2484 tryCompare(topLevelSurfaceList, "count", countBeforeClose - 1);
2485+ tryCompare(ApplicationManager, "focusedApplicationId", "calendar-app");
2485 }
2486 }
2486 }
2487 }
2487}
2488}