matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix message when banned not fitting in the window, also partially fix issue #98 but needs to be done from the server

Browse Source
This commit is contained in:
jacob1 2013-06-20 11:19:31 -04:00
parent 06fb97bc40
commit fcff2ecc7f
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/login/LoginModel.cpp
View File

@ -20,6 +20,9 @@ void LoginModel::Login(string username, string password)
break;
case LoginError:
statusText = "Error: " + Client::Ref().GetLastError();
int banStart = statusText.find(". Ban expire in"); //TODO: temporary, remove this when the ban message is fixed
if (banStart != statusText.npos)
statusText.replace(banStart, 15, ". Login at http://powdertoy.co.uk in order to see the full ban reason. Ban expires in");
break;
}
notifyStatusChanged();

22
src/gui/login/LoginView.cpp
View File

@ -41,7 +41,9 @@ LoginView::LoginView():
targetSize = Size;
FocusComponent(usernameField);
infoLabel->Appearance.HorizontalAlign = ui::Appearance::AlignCentre; infoLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
infoLabel->Appearance.HorizontalAlign = ui::Appearance::AlignCentre;
infoLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop;
infoLabel->SetMultiline(true);
infoLabel->Visible = false;
AddComponent(infoLabel);
@ -56,14 +58,17 @@ LoginView::LoginView():
cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
cancelButton->SetActionCallback(new CancelAction(this));
AddComponent(titleLabel);
titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
AddComponent(usernameField);
usernameField->Appearance.icon = IconUsername;
usernameField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; usernameField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
usernameField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
usernameField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
AddComponent(passwordField);
passwordField->Appearance.icon = IconPassword;
passwordField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; passwordField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
passwordField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
passwordField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
passwordField->SetHidden(true);
}
@ -87,12 +92,15 @@ void LoginView::OnTryExit(ExitMethod method)
void LoginView::NotifyStatusChanged(LoginModel * sender)
{
if(!infoLabel->GetText().length() && sender->GetStatusText().length())
if (infoLabel->Visible)
targetSize.Y -= infoLabel->Size.Y+2;
infoLabel->SetText(sender->GetStatusText());
infoLabel->AutoHeight();
if (sender->GetStatusText().length())
{
targetSize = Size+ui::Point(0, 18);
targetSize.Y += infoLabel->Size.Y+2;
infoLabel->Visible = true;
}
infoLabel->SetText(sender->GetStatusText());
if(sender->GetStatus())
{
c->Exit();