migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-01 06:10:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

On Windows, fix IME area not working

Browse Source
This commit is contained in:
wjian23
2023-12-22 03:44:30 +08:00
committed by Kirill Chibisov
parent cafcaa2cdc
commit 6fbdbce6dd
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -20,6 +20,7 @@ Unreleased` header.
- On X11, fix `Xft.dpi` detection from Xresources. - On X11, fix `Xft.dpi` detection from Xresources.
- On Windows, fix consecutive calls to `window.set_fullscreen(Some(Fullscreen::Borderless(None)))` resulting in losing previous window state when eventually exiting fullscreen using `window.set_fullscreen(None)`. - On Windows, fix consecutive calls to `window.set_fullscreen(Some(Fullscreen::Borderless(None)))` resulting in losing previous window state when eventually exiting fullscreen using `window.set_fullscreen(None)`.
- On Wayland, fix resize being sent on focus change. - On Wayland, fix resize being sent on focus change.
- On Windows, fix `set_ime_cursor_area`.
# 0.29.4 # 0.29.4

18
src/platform_impl/windows/ime.rs
View File

@@ -10,9 +10,9 @@ use windows_sys::Win32::{
UI::{ UI::{
Input::Ime::{ Input::Ime::{
ImmAssociateContextEx, ImmGetCompositionStringW, ImmGetContext, ImmReleaseContext, ImmAssociateContextEx, ImmGetCompositionStringW, ImmGetContext, ImmReleaseContext,
ImmSetCandidateWindow, ATTR_TARGET_CONVERTED, ATTR_TARGET_NOTCONVERTED, CANDIDATEFORM, ImmSetCandidateWindow, ImmSetCompositionWindow, ATTR_TARGET_CONVERTED,
CFS_EXCLUDE, GCS_COMPATTR, GCS_COMPSTR, GCS_CURSORPOS, GCS_RESULTSTR, IACE_CHILDREN, ATTR_TARGET_NOTCONVERTED, CANDIDATEFORM, CFS_EXCLUDE, CFS_POINT, COMPOSITIONFORM,
IACE_DEFAULT, GCS_COMPATTR, GCS_COMPSTR, GCS_CURSORPOS, GCS_RESULTSTR, IACE_CHILDREN, IACE_DEFAULT,
}, },
WindowsAndMessaging::{GetSystemMetrics, SM_IMMENABLED}, WindowsAndMessaging::{GetSystemMetrics, SM_IMMENABLED},
}, },
@@ -124,7 +124,7 @@ impl ImeContext {
left: x, left: x,
top: y, top: y,
right: x + width, right: x + width,
bottom: y - height, bottom: y + height,
}; };
let candidate_form = CANDIDATEFORM { let candidate_form = CANDIDATEFORM {
dwIndex: 0, dwIndex: 0,
@@ -132,8 +132,16 @@ impl ImeContext {
ptCurrentPos: POINT { x, y }, ptCurrentPos: POINT { x, y },
rcArea: rc_area, rcArea: rc_area,
}; };
let composition_form = COMPOSITIONFORM {
dwStyle: CFS_POINT,
ptCurrentPos: POINT { x, y: y + height },
rcArea: rc_area,
};
unsafe { ImmSetCandidateWindow(self.himc, &candidate_form) }; unsafe {
ImmSetCompositionWindow(self.himc, &composition_form);
ImmSetCandidateWindow(self.himc, &candidate_form);
}
} }
pub unsafe fn set_ime_allowed(hwnd: HWND, allowed: bool) { pub unsafe fn set_ime_allowed(hwnd: HWND, allowed: bool) {