Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Make System_InputBox API asynchronous.

Browse Source 
Doing this as a precursor to cleaning up the Android madness.
This commit is contained in:
Unknown W. Brackets committed 2020-03-08 18:59:17 -07:00
1 parent f648a82df9
commit efceb031ce
8 files changed
+70 -88
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Dialog/PSPOskDialog.cpp
+14 -8
View File
@@ -15,9 +15,10 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <algorithm>
#include "i18n/i18n.h"
#include "math/math_util.h"
#include <algorithm>
#include "util/text/utf8.h"
#include "Core/Dialog/PSPOskDialog.h"
#include "Core/Util/PPGeDraw.h"
@@ -853,14 +854,19 @@ int PSPOskDialog::NativeKeyboard() {
if (defaultText.empty())
defaultText.assign(L"VALUE");
if (System_InputBoxGetWString(titleText.c_str(), defaultText, inputChars)) {
u32 maxLength = FieldMaxLength();
if (inputChars.length() > maxLength) {
ERROR_LOG(SCEUTILITY, "NativeKeyboard: input text too long(%d characters/glyphs max), truncating to game-requested length.", maxLength);
inputChars.erase(maxLength, std::string::npos);
// TODO: This is USING_WIN_UI only, so we rely on it being synchronous...
// But we should really have this set some state that is checked each time NativeKeyboard is called.
System_InputBoxGetString(ConvertWStringToUTF8(titleText), ConvertWStringToUTF8(defaultText), [&](bool result, const std::string &value) {
if (result) {
inputChars = ConvertUTF8ToWString(value);
u32 maxLength = FieldMaxLength();
if (inputChars.length() > maxLength) {
ERROR_LOG(SCEUTILITY, "NativeKeyboard: input text too long(%d characters/glyphs max), truncating to game-requested length.", maxLength);
inputChars.erase(maxLength, std::string::npos);
}
}
}
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0);
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0);
});
u16_le *outText = oskParams->fields[0].outtext;