Skip to content

Commit 2d3bcf1

Browse files
nyjinnyjin
authored
Merge e144699 into 6af44d7 
2 parents 6af44d7 + e144699 commit 2d3bcf1

2 files changed

Lines changed: 32 additions & 23 deletions

File tree

‎CefSharp.Wpf/Experimental/WpfIMEKeyboardHandler.cs‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -177,31 +177,31 @@ private IntPtr SourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, re
177177
switch ((WM)msg)
178178
{
179179
case WM.IME_SETCONTEXT:
180-
{
181-
OnImeSetContext(hwnd, (uint)msg, wParam, lParam);
182-
handled = true;
183-
break;
184-
}
180+
{
181+
OnImeSetContext(hwnd, (uint)msg, wParam, lParam);
182+
handled = true;
183+
break;
184+
}
185185
case WM.IME_STARTCOMPOSITION:
186-
{
187-
OnIMEStartComposition(hwnd);
188-
hasImeComposition = true;
189-
handled = true;
190-
break;
191-
}
186+
{
187+
OnIMEStartComposition(hwnd);
188+
hasImeComposition = true;
189+
handled = true;
190+
break;
191+
}
192192
case WM.IME_COMPOSITION:
193-
{
194-
OnImeComposition(hwnd, lParam.ToInt32());
195-
handled = true;
196-
break;
197-
}
193+
{
194+
OnImeComposition(hwnd, lParam.ToInt32());
195+
handled = true;
196+
break;
197+
}
198198
case WM.IME_ENDCOMPOSITION:
199-
{
200-
OnImeEndComposition(hwnd);
201-
hasImeComposition = false;
202-
handled = true;
203-
break;
204-
}
199+
{
200+
OnImeEndComposition(hwnd);
201+
hasImeComposition = false;
202+
handled = true;
203+
break;
204+
}
205205
}
206206

207207
return handled ? IntPtr.Zero : new IntPtr(1);
@@ -253,7 +253,13 @@ public void CancelComposition(IntPtr hwnd)
253253

254254
private void OnImeEndComposition(IntPtr hwnd)
255255
{
256-
owner.GetBrowserHost().ImeFinishComposingText(false);
256+
// Korean IMEs somehow ignore function calls to ::ImeFinishComposingText()
257+
// The same letter is commited in ::OnImeComposition.
258+
if (languageCodeId != ImeNative.LANG_KOREAN)
259+
{
260+
owner.GetBrowserHost().ImeFinishComposingText(false);
261+
}
262+
257263
DestroyImeWindow(hwnd);
258264
}
259265

‎CefSharp3.sln.DotSettings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@
9797
<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/GotoSingleHierarchyItemImmediately/@EntryValue">False</s:Boolean>
9898
<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/GotoSingleUsageImmediately/@EntryValue">False</s:Boolean>
9999
<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
100+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
101+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
102+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
100103
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
101104
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
102105
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>

0 commit comments

Comments
 (0)