git.iko.soy/unity8
on xenial help sign in
focus the topmost item
a514e15Lukáš Tinkl
qml/Stages/PhoneStage.qml+1−2
compare with xenial
unifiedsplit
@@ -111,7 +111,6 @@ AbstractStage {
111 function closeFocusedDelegate() {
111 function closeFocusedDelegate() {
112 if (priv.focusedAppDelegate && priv.focusedAppDelegate.closeable) {
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
115 }
114 }
116 }
115 }
117
116
@@ -477,8 +476,8 @@ AbstractStage {
477 if (spreadView.closingIndex == -1) {
476 if (spreadView.closingIndex == -1) {
478 spreadView.phase = 0;
477 spreadView.phase = 0;
479 spreadView.contentX = -spreadView.shift;
478 spreadView.contentX = -spreadView.shift;
480− focusTopMostApp();
481 }
479 }
480+ focusTopMostApp();
482 }
481 }
483 function focusTopMostApp() {
482 function focusTopMostApp() {
484 if (spreadRepeater.count > 0) {
483 if (spreadRepeater.count > 0) {
qml/Stages/TabletStage.qml+1−2
@@ -87,7 +87,6 @@ AbstractStage {
87 function closeFocusedDelegate() {
87 function closeFocusedDelegate() {
88 if (priv.focusedAppDelegate && priv.focusedAppDelegate.closeable) {
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
91 }
90 }
92 }
91 }
93
92
@@ -719,8 +718,8 @@ AbstractStage {
719 if (spreadView.closingIndex == -1) {
718 if (spreadView.closingIndex == -1) {
720 spreadView.phase = 0;
719 spreadView.phase = 0;
721 spreadView.contentX = -spreadView.shift;
720 spreadView.contentX = -spreadView.shift;
722− focusTopMostApp();
723 }
721 }
722+ focusTopMostApp();
724 }
723 }
725 function focusTopMostApp() {
724 function focusTopMostApp() {
726 if (spreadRepeater.count > 0) {
725 if (spreadRepeater.count > 0) {