on xenial help sign in
Merge default-wallpaper
3906ddaMichael Terry
qml/Greeter/NarrowView.qml+1
@@ -136,6 +136,7 @@ FocusScope {
136
136
137 // Darken background to match CoverPage
137 // Darken background to match CoverPage
138 Rectangle {
138 Rectangle {
139+ objectName: "lockscreenShade"
139 anchors.fill: parent
140 anchors.fill: parent
140 color: "black"
141 color: "black"
141 opacity: root.hasCustomBackground ? 0.4 : 0
142 opacity: root.hasCustomBackground ? 0.4 : 0
tests/qmltests/Greeter/tst_NarrowView.qml+3−3
@@ -346,14 +346,14 @@ Item {
346 }
346 }
347
347
348 function test_customBackground() {
348 function test_customBackground() {
349− var lockscreen = findChild(view, "lockscreen");
349+ var lockscreenShade = findChild(view, "lockscreenShade");
350 var backgroundShade = findChild(view, "backgroundShade");
350 var backgroundShade = findChild(view, "backgroundShade");
351
351
352− compare(lockscreen.darkenBackground, 0);
352+ compare(lockscreenShade.opacity, 0);
353 verify(!backgroundShade.visible);
353 verify(!backgroundShade.visible);
354
354
355 view.hasCustomBackground = true;
355 view.hasCustomBackground = true;
356− compare(lockscreen.darkenBackground, 0.4);
356+ compare(lockscreenShade.opacity, 0.4);
357 verify(backgroundShade.visible);
357 verify(backgroundShade.visible);
358 }
358 }
359
359