summaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-12-04 23:14:54 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-12-04 23:14:54 +0100
commitc2d7cfe5387db5792a8832a58d7735969a827130 (patch)
treeab8084fd5a40db988bf24c572475016f15f304ff /platform
parent6b21a185e200c5c31bcfef87727d318178647d58 (diff)
parent5962e5278c470e5f021c9b0e9178e0634968b337 (diff)
downloadredot-engine-c2d7cfe5387db5792a8832a58d7735969a827130.tar.gz
Merge pull request #85458 from HolySkyMin/mac_korean_fix
Fix IME key event being erased in macOS
Diffstat (limited to 'platform')
-rw-r--r--platform/macos/display_server_macos.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
index 2a6f17cb5d..407a315827 100644
--- a/platform/macos/display_server_macos.mm
+++ b/platform/macos/display_server_macos.mm
@@ -725,7 +725,8 @@ void DisplayServerMacOS::update_mouse_pos(DisplayServerMacOS::WindowData &p_wd,
}
void DisplayServerMacOS::pop_last_key_event() {
- if (key_event_pos > 0) {
+ // Does not pop last key event when it is an IME key event.
+ if (key_event_pos > 0 && key_event_buffer[key_event_pos - 1].raw) {
key_event_pos--;
}
}