Change to fix DEV-43230 (Japanese input methods don't work with the web browser plugin on the Mac.)
Inside LLWindowMacOSX::allowLanguageTextInput(), tell the Text Services Manager to put up its own UI for input methods if language text input is being disallowed. This means that the non-inline UI will come up when when entering text in a browser plugin instance with an interactive text input method selected.master
parent
8ea25d130d
commit
8f451be20e
|
|
@ -522,7 +522,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
|
|||
if (mTSMDocument)
|
||||
{
|
||||
ActivateTSMDocument(mTSMDocument);
|
||||
UseInputWindow(mTSMDocument, FALSE);
|
||||
allowLanguageTextInput(NULL, FALSE);
|
||||
}
|
||||
}
|
||||
|
|
@ -3317,6 +3316,8 @@ void LLWindowMacOSX::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b)
|
|||
return;
|
||||
}
|
||||
|
||||
UseInputWindow(mTSMDocument, !b);
|
||||
|
||||
// Take care of old and new preeditors.
|
||||
if (preeditor != mPreeditor || !b)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue