Better exiting from windows (Escape and Enter) and 'q' for exit, fixes #35 and #60

1 files changed, 2 insertions, 5 deletions

diff --git a/src/login/LoginView.cpp b/src/login/LoginView.cpp
index 5a31f45..2902547 100644
--- a/src/login/LoginView.cpp
+++ b/src/login/LoginView.cpp
@@ -48,11 +48,13 @@ LoginView::LoginView():
 	AddComponent(infoLabel);
 	
 	AddComponent(loginButton);
+	SetOkayButton(loginButton);
 	loginButton->Appearance.HorizontalAlign = ui::Appearance::AlignRight;
 	loginButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	loginButton->Appearance.TextInactive = style::Colour::ConfirmButton;
 	loginButton->SetActionCallback(new LoginAction(this));
 	AddComponent(cancelButton);
+	SetCancelButton(cancelButton);
 	cancelButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
 	cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	cancelButton->SetActionCallback(new CancelAction(this));
@@ -78,11 +80,6 @@ void LoginView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, boo
 		else
 			FocusComponent(usernameField);
 		break;
-	case KEY_ENTER:
-	case KEY_RETURN:
-		if(IsFocused(passwordField))
-			loginButton->DoAction();
-		break;
 	}
 }