Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32][USER32] EDIT: Fix caret position for IME

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2023-04-10 08:27:50 +09:00
parent 5ff0ef403e
commit 8f2c2c1def
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/comctl32/edit.c
View file

@ -4392,7 +4392,11 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es)
{ {
if (CompFlag & GCS_COMPSTR) if (CompFlag & GCS_COMPSTR)
EDIT_GetCompositionStr(hIMC, CompFlag, es); EDIT_GetCompositionStr(hIMC, CompFlag, es);
#ifdef __REACTOS__
cursor = 0;
#else
cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0);
#endif
} }
ImmReleaseContext(hwnd, hIMC); ImmReleaseContext(hwnd, hIMC);
EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP);

4
win32ss/user/user32/controls/edit.c
View file

@ -4617,7 +4617,11 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es)
{ {
if (CompFlag & GCS_COMPSTR) if (CompFlag & GCS_COMPSTR)
EDIT_GetCompositionStr(hIMC, CompFlag, es); EDIT_GetCompositionStr(hIMC, CompFlag, es);
#ifdef __REACTOS__
cursor = 0;
#else
cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0);
#endif
} }
ImmReleaseContext(hwnd, hIMC); ImmReleaseContext(hwnd, hIMC);
EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP);