bug 88425
Force to end IMEComposition when user switches keyboard layout. /r=ftang;/sr=shaver git-svn-id: svn://10.0.0.236/trunk@104175 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
48879a26b5
commit
20386b8ea6
@ -4965,15 +4965,20 @@ BOOL nsWindow::OnInputLangChange(HKL aHKL, LRESULT *oRetValue)
|
||||
printf("OnInputLanguageChange\n");
|
||||
#endif
|
||||
|
||||
if(gKeyboardLayout != aHKL)
|
||||
{
|
||||
gKeyboardLayout = aHKL;
|
||||
*oRetValue = LangIDToCP((WORD)((DWORD)gKeyboardLayout & 0x0FFFF),
|
||||
gCurrentKeyboardCP);
|
||||
}
|
||||
|
||||
if(gKeyboardLayout != aHKL)
|
||||
{
|
||||
gKeyboardLayout = aHKL;
|
||||
*oRetValue = LangIDToCP((WORD)((DWORD)gKeyboardLayout & 0x0FFFF),
|
||||
gCurrentKeyboardCP);
|
||||
}
|
||||
ResetInputState();
|
||||
return PR_FALSE; // always pass to child window
|
||||
ResetInputState();
|
||||
|
||||
if (mIMEIsComposing) {
|
||||
HandleEndComposition();
|
||||
}
|
||||
|
||||
return PR_FALSE; // always pass to child window
|
||||
}
|
||||
//==========================================================================
|
||||
BOOL nsWindow::OnIMEChar(BYTE aByte1, BYTE aByte2, LPARAM aKeyState)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user