git.iko.soy/unity8
on xenial help sign in
Some minor cleanups
9719a30Michael Terry
Shell.qml+7−4
compare with xenial
unifiedsplit
@@ -537,20 +537,23 @@ FocusScope {
537
537
538 Connections {
538 Connections {
539 target: greeter
539 target: greeter
540− onUnlocked: rightEdgeDemo.visible = false
540+
541− onShownChanged: {
541+ function hide() {
542− if (rightEdgeDemo.active && !greeter.shown) {
542+ if (rightEdgeDemo.active) {
543 rightEdgeDemo.enabled = false
543 rightEdgeDemo.enabled = false
544 shell.hideEdgeDemoInGreeter()
544 shell.hideEdgeDemoInGreeter()
545 }
545 }
546 }
546 }
547+
548+ onUnlocked: hide()
549+ onShownChanged: if (!greeter.shown) hide()
547 }
550 }
548 }
551 }
549 }
552 }
550
553
551 InputFilterArea {
554 InputFilterArea {
552− blockInput: greeter.shown || lockscreen.shown
553 anchors.fill: parent
555 anchors.fill: parent
556+ blockInput: greeter.shown || lockscreen.shown
554 }
557 }
555
558
556 Connections {
559 Connections {
tests/mocks/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
1add_subdirectory(AccountsService)
1add_subdirectory(AccountsService)
2−add_subdirectory(HudClient)
3add_subdirectory(GSettings)
2add_subdirectory(GSettings)
3+add_subdirectory(HudClient)
4add_subdirectory(libusermetrics)
4add_subdirectory(libusermetrics)
5add_subdirectory(LightDM)
5add_subdirectory(LightDM)
6add_subdirectory(QMenuModel)
6add_subdirectory(QMenuModel)