Merge pull request #110078 from bruvzg/emb_kmap

Repiteo · Repiteo · commit ba3b0247650b · 2025-10-31T09:23:34.000-05:00
[macOS] Fix keyboard mapping init in embedded display server.
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
@@ -3726,8 +3726,6 @@
 }
 
 DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
-	KeyMappingMacOS::initialize();
-
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
 
 	r_error = OK;
diff --git a/platform/macos/display_server_macos_base.mm b/platform/macos/display_server_macos_base.mm
@@ -302,6 +302,8 @@
 }
 
 DisplayServerMacOSBase::DisplayServerMacOSBase() {
+	KeyMappingMacOS::initialize();
+
 	// Init TTS
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {

Original file line number	Diff line number	Diff line change
`@@ -3726,8 +3726,6 @@`
`3726`	`3726`	`}`
`3727`	`3727`
`3728`	`3728`	`DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {`
`3729`		`- KeyMappingMacOS::initialize();`
`3730`		`-`
`3731`	`3729`	`Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);`
`3732`	`3730`
`3733`	`3731`	`r_error = OK;`
Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,8 @@`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`DisplayServerMacOSBase::DisplayServerMacOSBase() {`
	`305`	`+ KeyMappingMacOS::initialize();`
	`306`	`+`
`305`	`307`	`// Init TTS`
`306`	`308`	`bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");`
`307`	`309`	`if (tts_enabled) {`