backport the fix for focusedAppDelegate
commit684aa61b83372357b62a0910add9bcbd29bbcd2a
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateWed 7 Sep 2016, 11:48 (10 years ago)
parent2bbbd58
qml/Stages/TopLevelSurfaceRepeater.qml+7−1
@@ -27,7 +27,13 @@ Repeater {
2727 if (!startingUp) {
2828 // the top-most surface must be the focused one.
2929 var topmostDelegate = itemAt(0);
30− topmostDelegate.focus = true;
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 {
35+ topmostDelegate.focus = true;
36+ }
3137 }
3238 }
3339