Merge pull request #87498 from bruvzg/mac_fix_mod_space_events

[macOS] Fix missing modifier + space key down events.
godotengine · Jan 24, 2024 · 47ec590 · 47ec590
2 parents 6876303 + ce47551
commit 47ec590
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/platform/macos/godot_content_view.mm b/platform/macos/godot_content_view.mm
@@ -576,21 +576,23 @@ - (void)keyDown:(NSEvent *)event {
 			String u32text;
 			u32text.parse_utf16(text.ptr(), text.length());
 
+			DisplayServerMacOS::KeyEvent ke;
+			ke.window_id = window_id;
+			ke.macos_state = [event modifierFlags];
+			ke.pressed = true;
+			ke.echo = [event isARepeat];
+			ke.keycode = KeyMappingMacOS::remap_key([event keyCode], [event modifierFlags], false);
+			ke.physical_keycode = KeyMappingMacOS::translate_key([event keyCode]);
+			ke.key_label = KeyMappingMacOS::remap_key([event keyCode], [event modifierFlags], true);
+			ke.raw = true;
+
+			if (u32text.is_empty()) {
+				ke.unicode = 0;
+				ds->push_to_key_event_buffer(ke);
+			}
 			for (int i = 0; i < u32text.length(); i++) {
 				const char32_t codepoint = u32text[i];
-
-				DisplayServerMacOS::KeyEvent ke;
-
-				ke.window_id = window_id;
-				ke.macos_state = [event modifierFlags];
-				ke.pressed = true;
-				ke.echo = [event isARepeat];
-				ke.keycode = KeyMappingMacOS::remap_key([event keyCode], [event modifierFlags], false);
-				ke.physical_keycode = KeyMappingMacOS::translate_key([event keyCode]);
-				ke.key_label = KeyMappingMacOS::remap_key([event keyCode], [event modifierFlags], true);
 				ke.unicode = fix_unicode(codepoint);
-				ke.raw = true;
-
 				ds->push_to_key_event_buffer(ke);
 			}
 		} else {