allow screentextentry to reset an input redirect to its prior state

gamebuttons overlapping type-text cause issues and this lets us ignore them (but still disabled by default)
etternagame · Nov 12, 2021 · 790a1f3 · 790a1f3
1 parent f8d1b0e
commit 790a1f3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Etterna/Screen/Others/ScreenTextEntry.cpp b/src/Etterna/Screen/Others/ScreenTextEntry.cpp
@@ -42,6 +42,9 @@ static const char* g_szKeys[NUM_KeyboardRow][KEYS_PER_ROW] = {
 };
 
 std::string ScreenTextEntry::s_sLastAnswer = "";
+bool ScreenTextEntry::s_bMustResetInputRedirAtClose = false;
+bool ScreenTextEntry::s_bResetInputRedirTo = false;
+
 
 // Settings:
 namespace {
@@ -386,6 +389,11 @@ ScreenTextEntry::BeginScreen()
 
 	ScreenWithMenuElements::BeginScreen();
 
+	if (s_bMustResetInputRedirAtClose) {
+		s_bResetInputRedirTo = SCREENMAN->get_input_redirected(PLAYER_1);
+		SCREENMAN->set_input_redirected(PLAYER_1, false);
+	}
+
 	if (sQuestion != "")
 		m_textQuestion.SetText(sQuestion);
 	else
@@ -593,6 +601,10 @@ ScreenTextEntry::End(bool bCancelled)
 
 	s_bCancelledLast = bCancelled;
 	s_sLastAnswer = bCancelled ? std::string("") : WStringToString(m_sAnswer);
+	if (s_bMustResetInputRedirAtClose) {
+		s_bMustResetInputRedirAtClose = false;
+		SCREENMAN->set_input_redirected(PLAYER_1, s_bResetInputRedirTo);
+	}
 }
 
 bool

diff --git a/src/Etterna/Screen/Others/ScreenTextEntry.h b/src/Etterna/Screen/Others/ScreenTextEntry.h
@@ -171,6 +171,9 @@ class ScreenTextEntry : public ScreenWithMenuElements
 	static std::string s_sLastAnswer;
 	static bool s_bCancelledLast;
 
+	static bool s_bMustResetInputRedirAtClose;
+	static bool s_bResetInputRedirTo;
+
 	// Lua
 	void PushSelf(lua_State* L) override;