leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On Windows, fix IME APIs MT-safety

Browse source 
Execute the calls to the IME from the main thread.

Fixes #3123.
This commit is contained in:
Kirill Chibisov 2023-10-20 15:46:57 +04:00 • committed by GitHub
parent 98b3508aca
commit 36d4907da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/platform_impl/windows/window.rs
View file

@ -872,17 +872,22 @@ impl Window {
#[inline]
pub fn set_ime_cursor_area(&self, spot: Position, size: Size) {
unsafe {
ImeContext::current(self.hwnd()).set_ime_cursor_area(spot, size, self.scale_factor());
}
let window = self.window.clone();
let state = self.window_state.clone();
self.thread_executor.execute_in_thread(move || unsafe {
let scale_factor = state.lock().unwrap().scale_factor;
ImeContext::current(window.0).set_ime_cursor_area(spot, size, scale_factor);
});
}
#[inline]
pub fn set_ime_allowed(&self, allowed: bool) {
self.window_state_lock().ime_allowed = allowed;
unsafe {
ImeContext::set_ime_allowed(self.hwnd(), allowed);
}
let window = self.window.clone();
let state = self.window_state.clone();
self.thread_executor.execute_in_thread(move || unsafe {
state.lock().unwrap().ime_allowed = allowed;
ImeContext::set_ime_allowed(window.0, allowed);
})
}
#[inline]