f56dd66 · unity8 · git.iko.soy

on xenial help sign in

only clear the lockscreen when it is requested, not directly after entering

f56dd66Michael Zanetti13 years ago

Greeter/Lockscreen.qml+6−1

@@ -41,6 +41,12 @@ Showable {

41 signal cancel()

42 signal emergencyCall()

44+ onRequiredChanged: {

45+ if (required) {

46+ pinPadLoader.item.clear(false);

47+ }

48+ }

49+

44 function reset() {

50 function reset() {

45 pinPadLoader.resetting = true;

51 pinPadLoader.resetting = true;

46 pinPadLoader.resetting = false;

52 pinPadLoader.resetting = false;

@@ -140,7 +146,6 @@ Showable {

140 }

146 }

141 if (LightDM.Greeter.authenticated) {

147 if (LightDM.Greeter.authenticated) {

142 root.unlocked();

148 root.unlocked();

143− pinPadLoader.item.clear(false);

144 } else {

149 } else {

145 pinPadLoader.item.clear(true);

150 pinPadLoader.item.clear(true);

146 }

151 }

Shell.qml+1−1

@@ -380,7 +380,7 @@ FocusScope {

380 } else {

381 lockscreen.alphaNumeric = true

382 }

383− lockscreen.placeholderText = i18n.tr("Please enter %1:").arg(text);

383+ lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);

384 lockscreen.show();

385 }

386 }