on xenial help sign in
backport the fix for focusedAppDelegate
684aa61Lukáš Tinkl
qml/Stages/TopLevelSurfaceRepeater.qml+7−1
@@ -27,7 +27,13 @@ Repeater {
27 if (!startingUp) {
27 if (!startingUp) {
28 // the top-most surface must be the focused one.
28 // the top-most surface must be the focused one.
29 var topmostDelegate = itemAt(0);
29 var topmostDelegate = itemAt(0);
30+ if (topmostDelegate.focus) {
31+ // Delegate got focused while we were still starting up. Not good.
32+ // Force signal handler to run again
33+ topmostDelegate.onFocusChanged(true);
34+ } else {
30− topmostDelegate.focus = true;
35+ topmostDelegate.focus = true;
36+ }
31 }
37 }
32 }
38 }
33
39