Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #110078 from bruvzg/emb_kmap

Browse source 
[macOS] Fix keyboard mapping init in embedded display server.
This commit is contained in:
Thaddeus Crews 2025-10-31 09:23:34 -05:00
commit ba3b024765
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/macos/display_server_macos.mm
View file

@ -3726,8 +3726,6 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
}
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;

2
platform/macos/display_server_macos_base.mm
View file

@ -302,6 +302,8 @@ void DisplayServerMacOSBase::show_emoji_and_symbol_picker() const {
}
DisplayServerMacOSBase::DisplayServerMacOSBase() {
KeyMappingMacOS::initialize();
// Init TTS
bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
if (tts_enabled) {