always send release inputs from dispatchKeyboardMSG to imgui

matcool · Dec 7, 2023 · bc342a8 · bc342a8
1 parent 3c7f7c2
commit bc342a8
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/hooks.cpp b/src/hooks.cpp
@@ -80,14 +80,21 @@ bool shouldBlockInput() {
 
 class $modify(CCKeyboardDispatcher) {
 	bool dispatchKeyboardMSG(enumKeyCodes key, bool down) {
-		if (!ImGuiCocos::get().isInitialized() || (!ImGui::GetIO().WantCaptureKeyboard && !shouldBlockInput())) {
+		if (!ImGuiCocos::get().isInitialized())
 			return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down);
+
+		const bool shouldEatInput = ImGui::GetIO().WantCaptureKeyboard || shouldBlockInput();
+		if (shouldEatInput || !down) {
+			const auto imKey = cocosToImGuiKey(key);
+			if (imKey != ImGuiKey_None) {
+				ImGui::GetIO().AddKeyEvent(imKey, down);
+			}
 		}
-		const auto imKey = cocosToImGuiKey(key);
-		if (imKey != ImGuiKey_None) {
-			ImGui::GetIO().AddKeyEvent(imKey, down);
+		if (shouldEatInput) {
+			return false;
+		} else {
+			return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down);
 		}
-		return false;
 	}
 };