on xenial help sign in
some more OSK layer issue fixes
f3616b9Michael Zanetti
qml/Launcher/Launcher.qml+1
@@ -44,6 +44,7 @@ FocusScope {
44 readonly property alias shortcutHintsShown: panel.shortcutHintsShown
44 readonly property alias shortcutHintsShown: panel.shortcutHintsShown
45
45
46 readonly property bool shown: panel.x > -panel.width
46 readonly property bool shown: panel.x > -panel.width
47+ readonly property bool drawerShown: drawer.x == 0
47
48
48 // emitted when an application is selected
49 // emitted when an application is selected
49 signal launcherApplicationSelected(string appId)
50 signal launcherApplicationSelected(string appId)
qml/Shell.qml+1−1
@@ -321,7 +321,7 @@ StyledItem {
321 topMargin: panel.panelHeight
321 topMargin: panel.panelHeight
322 leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0
322 leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0
323 }
323 }
324− z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running || (greeter.shown && launcher.shown) ? overlay.z + 1 : overlay.z - 1
324+ z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running || launcher.drawerShown ? overlay.z + 1 : overlay.z - 1
325 }
325 }
326
326
327 Loader {
327 Loader {