migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-30 21:30:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

win32: fix ime setcontext lparam

Browse Source 
Fixes #3893.
This commit is contained in:
Kotomine Shiki
2026-03-01 21:08:45 +08:00
committed by Kirill Chibisov
parent bccc568345
commit 17a73f4dd4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/changelog/unreleased.md
View File

@@ -46,3 +46,4 @@ changelog entry.
- On X11, fix `set_hittest` not working on some window managers. - On X11, fix `set_hittest` not working on some window managers.
- On X11, fix debug mode overflow panic in `set_timestamp`. - On X11, fix debug mode overflow panic in `set_timestamp`.
- On macOS, fix crash in `set_marked_text` when native Pinyin IME sends out-of-bounds `selected_range`. - On macOS, fix crash in `set_marked_text` when native Pinyin IME sends out-of-bounds `selected_range`.
- On Windows, fix `WM_IME_SETCONTEXT` IME UI flag masking on `lParam`.

6
src/platform_impl/windows/event_loop.rs
View File

@@ -1612,9 +1612,9 @@ unsafe fn public_window_callback_inner(
}, },
WM_IME_SETCONTEXT => { WM_IME_SETCONTEXT => {
// Hide composing text drawn by IME. // IME UI visibility flags are in lparam.
let wparam = wparam & (!ISC_SHOWUICOMPOSITIONWINDOW as usize); let lparam = lparam & !(ISC_SHOWUICOMPOSITIONWINDOW as isize);
result = ProcResult::DefWindowProc(wparam); result = ProcResult::Value(unsafe { DefWindowProcW(window, msg, wparam, lparam) });
}, },
// this is necessary for us to maintain minimize/restore state // this is necessary for us to maintain minimize/restore state