Skip to content

Commit a396233

Browse files
committed
Platform IME: Windows: Revert 133bbaf and 29a8ee0 as regression until new results comes. (ocornut#2589, ocornut#5535, ocornut#5264, ocornut#4972)
1 parent 839c310 commit a396233

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/CHANGELOG.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Other Changes:
7474
can apply to mouse data as well. (#4921)
7575
- Nav: Fixed moving/resizing window with gamepad or keyboard when running at very high framerate.
7676
- Nav: Pressing Space/GamepadFaceDown on a repeating button uses the same repeating rate as a mouse hold.
77-
- Platform IME: [Windows] Fixed a call to ImmAssociateContextEx() leading to freeze on some setups.
77+
- Platform IME: [Windows] Removed call to ImmAssociateContextEx() leading to freeze on some setups.
7878
(#2589, #5535, #5264, #4972)
7979
- Misc: io.Framerate moving average now converge in 60 frames instead of 120. (#5236, #4138)
8080
- Debug Tools: Debug Log: Added IO events logging.

imgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12231,9 +12231,9 @@ static void SetPlatformImeDataFn_DefaultImpl(ImGuiViewport* viewport, ImGuiPlatf
1223112231
if (hwnd == 0)
1223212232
return;
1223312233

12234+
//::ImmAssociateContextEx(hwnd, NULL, data->WantVisible ? IACE_DEFAULT : 0);
1223412235
if (HIMC himc = ::ImmGetContext(hwnd))
1223512236
{
12236-
::ImmAssociateContextEx(hwnd, NULL, data->WantVisible ? IACE_DEFAULT : 0);
1223712237
COMPOSITIONFORM composition_form = {};
1223812238
composition_form.ptCurrentPos.x = (LONG)data->InputPos.x;
1223912239
composition_form.ptCurrentPos.y = (LONG)data->InputPos.y;

0 commit comments

Comments
 (0)