on xenial help sign in
some focus improvements
commit99914cb537e9c59e511011dac79ddc2ced09377f authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 16 Nov 2016, 13:47 (10 years ago) parent9305ba7
2 files changed+2−2
qml/Launcher/Launcher.qml+1 qml/Shell.qml+1−2
qml/Launcher/Launcher.qml+1
@@ -504,6 +504,7 @@ FocusScope {
504504 if (distance > panel.width / 2) {
505505 if (distance > panel.width * 3) {
506506 root.switchToNextState("drawer")
507+ root.focus = true;
507508 } else {
508509 root.switchToNextState("visible")
509510 }
qml/Shell.qml+1−2
@@ -299,7 +299,6 @@ StyledItem {
299299
300300 interactive: (!greeter || !greeter.shown)
301301 && panel.indicators.fullyClosed
302− && launcher.progress == 0
303302 && !notifications.useModal
304303
305304 onInteractiveChanged: { if (interactive) { focus = true; } }
@@ -322,7 +321,7 @@ StyledItem {
322321 topMargin: panel.panelHeight
323322 leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0
324323 }
325− z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running || launcher.shown ? overlay.z + 1 : overlay.z - 1
324+ z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running || (greeter.shown && launcher.shown) ? overlay.z + 1 : overlay.z - 1
326325 }
327326
328327 Loader {