[PATCH v4 1/6] imm32: Update the IME composition window position after drawing.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/imm32/ime.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index 3c4550c3cd9..8774e714365 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -96,7 +96,7 @@ static HFONT input_context_select_ui_font( INPUTCONTEXT *ctx, HDC hdc )
 static void ime_ui_paint( HIMC himc, HWND hwnd )
 {
     PAINTSTRUCT ps;
-    RECT rect;
+    RECT rect, new_rect;
     HDC hdc;
     HMONITOR monitor;
     MONITORINFO mon_info;
@@ -111,6 +111,7 @@ static void ime_ui_paint( HIMC himc, HWND hwnd )

GetClientRect( hwnd, &rect );
     FillRect( hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1) );
+    new_rect = rect;

if ((str = input_context_get_comp_str( ctx, FALSE, &len )))
     {
@@ -143,6 +144,7 @@ static void ime_ui_paint( HIMC himc, HWND hwnd )
             rect.top = cpt.y;
             rect.right = rect.left + pt.x;
             rect.bottom = rect.top + pt.y;
+            offset.x = offset.y = 0;
             monitor = MonitorFromPoint( cpt, MONITOR_DEFAULTTOPRIMARY );
         }
         else /* CFS_DEFAULT */
@@ -193,8 +195,7 @@ static void ime_ui_paint( HIMC himc, HWND hwnd )
             }
         }

-        SetWindowPos( hwnd, HWND_TOPMOST, rect.left, rect.top, rect.right - rect.left,
-                      rect.bottom - rect.top, SWP_NOACTIVATE );
+        new_rect = rect;
         TextOutW( hdc, offset.x, offset.y, str, len );

if (font) SelectObject( hdc, font );
@@ -203,6 +204,10 @@ static void ime_ui_paint( HIMC himc, HWND hwnd )

EndPaint( hwnd, &ps );
     ImmUnlockIMC( himc );
+
+    if (!EqualRect( &rect, &new_rect ))
+        SetWindowPos( hwnd, HWND_TOPMOST, new_rect.left, new_rect.top, new_rect.right - new_rect.left,
+                      new_rect.bottom - new_rect.top, SWP_NOACTIVATE );
 }

static void ime_ui_update_window( INPUTCONTEXT *ctx, HWND hwnd )