preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 02:29:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into TemporaryHackishBranch

Browse Source
This commit is contained in:
LunaMoo committed 2021-09-15 19:01:37 +02:00
2 parents 072e1522b3 9f404ad901
commit c0e78f79fc
9 files changed
+69 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/GameSettingsScreen.cpp
+9 -10
View File
@@ -1972,12 +1972,8 @@ void HostnameSelectScreen::CreatePopupContents(UI::ViewGroup *parent) {
parent->Add(ipRows_);
listIP.clear(); listIP.shrink_to_fit();
errorView_ = parent->Add(new TextView(n->T("Invalid IP or hostname"), ALIGN_HCENTER, false, new LinearLayoutParams(Margins(0, 10, 0, 0))));
errorView_->SetTextColor(0xFF3030FF);
errorView_->SetVisibility(V_GONE);
progressView_ = parent->Add(new TextView(n->T("Validating address..."), ALIGN_HCENTER, false, new LinearLayoutParams(Margins(0, 10, 0, 0))));
progressView_->SetVisibility(V_GONE);
progressView_->SetVisibility(V_INVISIBLE);
}
void HostnameSelectScreen::SendEditKey(int keyCode, int flags) {
@@ -2064,6 +2060,8 @@ void HostnameSelectScreen::ResolverThread() {
}
bool HostnameSelectScreen::CanComplete(DialogResult result) {
auto n = GetI18NCategory("Networking");
if (result != DR_OK)
return true;
@@ -2095,12 +2093,12 @@ bool HostnameSelectScreen::CanComplete(DialogResult result) {
lastResolvedResult_ = toResolveResult_;
if (lastResolvedResult_) {
errorView_->SetVisibility(UI::V_GONE);
progressView_->SetVisibility(UI::V_INVISIBLE);
} else {
errorView_->SetVisibility(UI::V_VISIBLE);
progressView_->SetText(n->T("Invalid IP or hostname"));
progressView_->SetTextColor(0xFF3030FF);
progressView_->SetVisibility(UI::V_VISIBLE);
}
progressView_->SetVisibility(UI::V_GONE);
return true;
}
@@ -2112,8 +2110,9 @@ bool HostnameSelectScreen::CanComplete(DialogResult result) {
toResolve_ = value;
resolverCond_.notify_one();
progressView_->SetText(n->T("Validating address..."));
progressView_->SetTextColor(0xFFFFFFFF);
progressView_->SetVisibility(UI::V_VISIBLE);
errorView_->SetVisibility(UI::V_GONE);
return false;
}