65bfae3 · unity8 · git.iko.soy

on xenial help sign in

Make sure that greeter prompt buttons are in focus chain too

65bfae3Michael Terry10 years ago

qml/Greeter/GreeterPrompt.qml+2

@@ -79,6 +79,7 @@ FocusScope {

79 objectName: "promptButton"

80 anchors.fill: parent

81 visible: !root.isPrompt

82+ activeFocusOnTab: true

83 styleName: "FocusShape"

84 styleName: "FocusShape"

@@ -98,6 +99,7 @@ FocusScope {

98 }

99 }

100 }

100

101

102+ Keys.onSpacePressed: triggered();

101 Keys.onReturnPressed: triggered();

103 Keys.onReturnPressed: triggered();

102 Keys.onEnterPressed: triggered();

104 Keys.onEnterPressed: triggered();

103 MouseArea {

105 MouseArea {

tests/mocks/liblightdm/MockGreeter.cpp+6

@@ -147,6 +147,12 @@ void Greeter::handleAuthenticate()

147{

148 Q_D(Greeter);

149

150+ if (d->authenticated) {

151+ // This can happen from the guest authentication flow

152+ Q_EMIT authenticationComplete();

153+ return;

154+ }

155+

150 if (d->authenticationUser.isEmpty()) {

156 if (d->authenticationUser.isEmpty()) {

151 Q_EMIT showPrompt("Username: ", Greeter::PromptTypeQuestion);

157 Q_EMIT showPrompt("Username: ", Greeter::PromptTypeQuestion);

152 return;

158 return;