diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-04 19:57:40 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-04 19:57:40 (GMT) |
| commit | 0f5b4a9ec83b8c6d2bb9448b6e58f841a875a636 (patch) | |
| tree | 37c55cf9d20fc543fe3bbb678f60f460f01bccf9 /src/login/LoginView.cpp | |
| parent | 6bea8f5235006eb46a045c4ce5d91ddead88f02c (diff) | |
| download | powder-0f5b4a9ec83b8c6d2bb9448b6e58f841a875a636.zip powder-0f5b4a9ec83b8c6d2bb9448b6e58f841a875a636.tar.gz | |
fix pressing esc in login prompt logging you out, fix possible sign bug crash
Diffstat (limited to 'src/login/LoginView.cpp')
| -rw-r--r-- | src/login/LoginView.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/login/LoginView.cpp b/src/login/LoginView.cpp index 8cbdcfb..3cb07c3 100644 --- a/src/login/LoginView.cpp +++ b/src/login/LoginView.cpp @@ -38,7 +38,7 @@ public: LoginView::LoginView(): ui::Window(ui::Point(-1, -1), ui::Point(200, 87)), loginButton(new ui::Button(ui::Point(200-100, 87-17), ui::Point(100, 17), "Sign in")), - cancelButton(new ui::Button(ui::Point(0, 87-17), ui::Point(101, 17), "Cancel")), + cancelButton(new ui::Button(ui::Point(0, 87-17), ui::Point(101, 17), "Sign Out")), titleLabel(new ui::Label(ui::Point(4, 5), ui::Point(200-16, 16), "Server login")), usernameField(new ui::Textbox(ui::Point(8, 25), ui::Point(200-16, 17), Client::Ref().GetAuthUser().Username, "[username]")), passwordField(new ui::Textbox(ui::Point(8, 46), ui::Point(200-16, 17), "", "[password]")), @@ -59,7 +59,6 @@ LoginView::LoginView(): 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)); @@ -88,6 +87,11 @@ void LoginView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, boo } } +void LoginView::OnTryExit(ExitMethod method) +{ + ui::Engine::Ref().CloseWindow(); +} + void LoginView::NotifyStatusChanged(LoginModel * sender) { if(!infoLabel->GetText().length() && sender->GetStatusText().length()) |