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

Don't close PROP and CUST dialogs when trying to validate empty strings

Browse Source
This commit is contained in:
Tamás Bálint Misius 2020-10-12 17:24:10 +02:00
parent 18dfd6de86
commit f57d503b41
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/game/GOLTool.cpp
View File

@ -51,12 +51,12 @@ toolSelection(toolSelection)
okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200); okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
okayButton->SetActionCallback({ [this] { okayButton->SetActionCallback({ [this] {
CloseActiveWindow();
if (nameField->GetText().length() && ruleField->GetText().length()) if (nameField->GetText().length() && ruleField->GetText().length())
{ {
CloseActiveWindow();
Validate(); Validate();
}
SelfDestruct(); SelfDestruct();
}
} }); } });
AddComponent(okayButton); AddComponent(okayButton);
SetOkayButton(okayButton); SetOkayButton(okayButton);

4
src/gui/game/PropertyTool.cpp
View File

@ -57,10 +57,12 @@ sim(sim_)
okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200); okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
okayButton->SetActionCallback({ [this] { okayButton->SetActionCallback({ [this] {
CloseActiveWindow();
if (textField->GetText().length()) if (textField->GetText().length())
{
CloseActiveWindow();
SetProperty(); SetProperty();
SelfDestruct(); SelfDestruct();
}
} }); } });
AddComponent(okayButton); AddComponent(okayButton);
SetOkayButton(okayButton); SetOkayButton(okayButton);