izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Switch UI event notifications (used for soft-keyboard) from strings to enums

Browse Source
This commit is contained in:
Henrik Rydgård
2024-05-20 18:25:16 +02:00
parent f0befda912
commit f61baa3b51
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/System/Request.h
View File

@@ -160,8 +160,8 @@ inline void System_ShareText(std::string_view text) {
g_requestManager.MakeSystemRequest(SystemRequestType::SHARE_TEXT, NO_REQUESTER_TOKEN, nullptr, nullptr, text, "", 0);
}
inline void System_NotifyUIState(std::string_view state) {
g_requestManager.MakeSystemRequest(SystemRequestType::NOTIFY_UI_STATE, NO_REQUESTER_TOKEN, nullptr, nullptr, state, "", 0);
inline void System_NotifyUIEvent(UIEventNotification notification) {
g_requestManager.MakeSystemRequest(SystemRequestType::NOTIFY_UI_EVENT, NO_REQUESTER_TOKEN, nullptr, nullptr, "", "", (int64_t)notification, 0);
}
inline void System_SetKeepScreenBright(bool keepScreenBright) {

9
Common/System/System.h
View File

@@ -56,6 +56,13 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url);
// Going forward, "optional" things (PPSSPP will still function alright without it) will be requests,
// to make implementations simpler in the default case.
enum class UIEventNotification {
MENU_RETURN,
POPUP_CLOSED,
TEXT_GOTFOCUS,
TEXT_LOSTFOCUS,
};
enum class SystemRequestType {
INPUT_TEXT_MODAL,
ASK_USERNAME_PASSWORD,
@@ -79,7 +86,7 @@ enum class SystemRequestType {
// Note: height specified as param3, width based on param1.size() / param3.
SEND_DEBUG_SCREENSHOT,
NOTIFY_UI_STATE, // Used on Android only. Not a SystemNotification since it takes a parameter.
NOTIFY_UI_EVENT, // Used to manage events that are useful for popup virtual keyboards.
SET_KEEP_SCREEN_BRIGHT,
// High-level hardware control

2
Common/UI/UIScreen.cpp
View File

@@ -398,7 +398,7 @@ void PopupScreen::TriggerFinish(DialogResult result) {
OnCompleted(result);
}
// Inform UI that popup close to hide OSK (if visible)
System_NotifyUIState("popup_closed");
System_NotifyUIEvent(UIEventNotification::POPUP_CLOSED);
}
void PopupScreen::CreateViews() {

6
Common/UI/View.cpp
View File

@@ -1110,14 +1110,12 @@ TextEdit::TextEdit(std::string_view text, std::string_view title, std::string_vi
}
void TextEdit::FocusChanged(int focusFlags) {
#if PPSSPP_PLATFORM(UWP)
if (focusFlags == FF_GOTFOCUS) {
System_NotifyUIState("text_gotfocus");
System_NotifyUIEvent(UIEventNotification::TEXT_GOTFOCUS);
}
else {
System_NotifyUIState("text_lostfocus");
System_NotifyUIEvent(UIEventNotification::TEXT_LOSTFOCUS);
}
#endif
}
void TextEdit::Draw(UIContext &dc) {

30
UWP/PPSSPP_UWPMain.cpp
View File

@@ -548,21 +548,23 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
});
return true;
}
case SystemRequestType::NOTIFY_UI_STATE:
case SystemRequestType::NOTIFY_UI_EVENT:
{
if (!param1.empty()) {
if (!strcmp(param1.c_str(), "menu")) {
CloseLaunchItem();
}
else if (!strcmp(param1.c_str(), "popup_closed")) {
DeactivateTextEditInput();
}
else if (!strcmp(param1.c_str(), "text_gotfocus")) {
ActivateTextEditInput(true);
}
else if (!strcmp(param1.c_str(), "text_lostfocus")) {
DeactivateTextEditInput(true);
}
switch ((UIEventNotification)param3) {
case UIEventNotification::MENU_RETURN:
CloseLaunchItem();
break;
case UIEventNotification::POPUP_CLOSED:
DeactivateTextEditInput();
break;
case UIEventNotification::TEXT_GOTFOCUS:
ActivateTextEditInput(true);
break;
case UIEventNotification::TEXT_LOSTFOCUS:
DeactivateTextEditInput(true);
break;
default:
break;
}
return true;
}