user32: Properly update caret position after result string is committed.

9ef2c648 · Qian Hong · Alexandre Julliard · e931b5d1 · 9ef2c648
Commit 9ef2c648 authored Jul 03, 2013 by Qian Hong Committed by Alexandre Julliard Jul 03, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

edit.c dlls/user32/edit.c +9 -3

No files found.
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -4421,10 +4421,16 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es)
        return;

    if (CompFlag & GCS_RESULTSTR)
+    {
        EDIT_GetResultStr(hIMC, es);
-    if (CompFlag & GCS_COMPSTR)
-        EDIT_GetCompositionStr(hIMC, CompFlag, es);
-    cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0);
+        cursor = 0;
+    }
+    else
+    {
+        if (CompFlag & GCS_COMPSTR)
+            EDIT_GetCompositionStr(hIMC, CompFlag, es);
+        cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0);
+    }
    ImmReleaseContext(hwnd, hIMC);
    EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP);
 }