on xenial help sign in
Fix showing "Retry" in password prompt when turning on screen in tablet mode.

Approved by: Michał Sawicz, Albert Astals Cid

commit6e6d35e35a165e05950c18fb219a1e49fea36575 authorMichael Terry <michael.terry@canonical.com> dateWed 30 Mar 2016, 07:46 (11 years ago) parent6e1c8f980fa423
3 files changed+5−2
qml/Greeter/Greeter.qml+1−1 tests/qmltests/Greeter/tst_Greeter.qml+1 tests/qmltests/tst_Shell.qml+3−1
qml/Greeter/Greeter.qml+1−1
@@ -61,7 +61,7 @@ Showable {
6161
6262 function forceShow() {
6363 showNow();
64− loader.item.reset();
64+ d.selectUser(d.currentIndex, true);
6565 }
6666
6767 function notifyAppFocused(appId) {
tests/qmltests/Greeter/tst_Greeter.qml+1
@@ -551,6 +551,7 @@ Item {
551551
552552 LightDM.Greeter.showGreeter();
553553 compare(viewResetSpy.count, 1);
554+ tryCompare(viewShowPromptSpy, "count", 1);
554555 }
555556 }
556557}
tests/qmltests/tst_Shell.qml+3−1
@@ -1140,7 +1140,9 @@ Rectangle {
11401140
11411141 showGreeter();
11421142
1143− tryCompare(sessionSpy, "count", 1);
1143+ var greeter = findChild(shell, "greeter");
1144+ verify(!greeter.locked);
1145+ verify(sessionSpy.count > 0);
11441146 }
11451147
11461148 function test_fullscreen() {