on xenial help sign in
Some minor cleanups
commit9719a304bc1e7cf767ac4f4b441a5c64428d11c7 authorMichael Terry <michael.terry@canonical.com> dateTue 6 Aug 2013, 09:52 (13 years ago) parent4bba354
2 files changed+8−5
Shell.qml+7−4 tests/mocks/CMakeLists.txt+1−1
Shell.qml+7−4
@@ -537,20 +537,23 @@ FocusScope {
537537
538538 Connections {
539539 target: greeter
540− onUnlocked: rightEdgeDemo.visible = false
541− onShownChanged: {
542− if (rightEdgeDemo.active && !greeter.shown) {
540+
541+ function hide() {
542+ if (rightEdgeDemo.active) {
543543 rightEdgeDemo.enabled = false
544544 shell.hideEdgeDemoInGreeter()
545545 }
546546 }
547+
548+ onUnlocked: hide()
549+ onShownChanged: if (!greeter.shown) hide()
547550 }
548551 }
549552 }
550553
551554 InputFilterArea {
552− blockInput: greeter.shown || lockscreen.shown
553555 anchors.fill: parent
556+ blockInput: greeter.shown || lockscreen.shown
554557 }
555558
556559 Connections {
tests/mocks/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
11add_subdirectory(AccountsService)
2−add_subdirectory(HudClient)
32add_subdirectory(GSettings)
3+add_subdirectory(HudClient)
44add_subdirectory(libusermetrics)
55add_subdirectory(LightDM)
66add_subdirectory(QMenuModel)