fix: Windows에서 동기적 IME Composition 수행 #6

heuguchon · heuguchon · commit efb1263be51f · 2025-03-19T18:29:40.000+09:00
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
@@ -2586,7 +2586,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
             LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_IME_COMPOSITION");
             if (LLWinImm::isAvailable() && window_imp->mPreeditor)
             {
-                WINDOW_IMP_POST(window_imp->handleCompositionMessage((U32)l_param));
+                window_imp->handleCompositionMessage((U32)l_param);
                 return 0;
             }
             break;
@@ -4328,10 +4328,7 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
 
     if (needs_update)
     {
-        if (preedit_string.length() != 0 || result_string.length() != 0)
-        {
-            mPreeditor->resetPreedit();
-        }
+        mPreeditor->resetPreedit();
 
         if (result_string.length() > 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -2586,7 +2586,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_`
`2586`	`2586`	`LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_IME_COMPOSITION");`
`2587`	`2587`	`if (LLWinImm::isAvailable() && window_imp->mPreeditor)`
`2588`	`2588`	`{`
`2589`		`- WINDOW_IMP_POST(window_imp->handleCompositionMessage((U32)l_param));`
	`2589`	`+ window_imp->handleCompositionMessage((U32)l_param);`
`2590`	`2590`	`return 0;`
`2591`	`2591`	`}`
`2592`	`2592`	`break;`
`@@ -4328,10 +4328,7 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)`
`4328`	`4328`
`4329`	`4329`	`if (needs_update)`
`4330`	`4330`	`{`
`4331`		`- if (preedit_string.length() != 0 \|\| result_string.length() != 0)`
`4332`		`- {`
`4333`		`- mPreeditor->resetPreedit();`
`4334`		`- }`
	`4331`	`+ mPreeditor->resetPreedit();`
`4335`	`4332`
`4336`	`4333`	`if (result_string.length() > 0)`
`4337`	`4334`	`{`