on xenial help sign in
Move hideIndicatorMenu to be shared between greeter and shell, as both have indicators that want to call it
37ab689Michael Terry
qml/Components/BasicShell.qml+4
@@ -69,6 +69,10 @@ FocusScope {
69 Keys.onVolumeUpPressed: volumeControl.volumeUp()
69 Keys.onVolumeUpPressed: volumeControl.volumeUp()
70 Keys.onVolumeDownPressed: volumeControl.volumeDown()
70 Keys.onVolumeDownPressed: volumeControl.volumeDown()
71
71
72+ function hideIndicatorMenu(delay) {
73+ panel.hideIndicatorMenu(delay);
74+ }
75+
72 focus: true
76 focus: true
73 onFocusChanged: if (!focus) forceActiveFocus();
77 onFocusChanged: if (!focus) forceActiveFocus();
74
78
qml/Shell.qml−4
@@ -412,10 +412,6 @@ BasicShell {
412 stages.hide()
412 stages.hide()
413 }
413 }
414
414
415− function hideIndicatorMenu(delay) {
416− panel.hideIndicatorMenu(delay);
417− }
418−
419 Item {
415 Item {
420 id: overlay
416 id: overlay
421
417