Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 17419. a=bobj@netscape.com, r=ftang@netscape.com

Browse Source
This commit is contained in:
tajima%eng.sun.com 2000-03-10 01:30:07 +00:00
parent 2e39119016
commit 3ecba57c7d
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/base/nsEditor.cpp
View File

@ -469,6 +469,9 @@ nsEditor::PostCreate()
NotifyDocumentListeners(eDocumentCreated);
NotifyDocumentListeners(eDocumentStateChanged);
// Call ResetInputState() for initialization
ForceCompositionEnd();
return NS_OK;
}

3
editor/libeditor/base/nsEditor.cpp
View File

@ -469,6 +469,9 @@ nsEditor::PostCreate()
NotifyDocumentListeners(eDocumentCreated);
NotifyDocumentListeners(eDocumentStateChanged);
// Call ResetInputState() for initialization
ForceCompositionEnd();
return NS_OK;
}

16
widget/src/gtk/nsWidget.cpp
View File

@ -278,6 +278,7 @@ nsWidget::nsWidget()
mXIC = 0;
mIMEShellWidget = 0;
mIMEChildWidget = 0;
mIMECallComposeStart = PR_FALSE;
mIMECallComposeEnd = PR_TRUE;
@ -2732,6 +2733,12 @@ nsWidget::GetXIC()
mXIC->SetPreeditSpotLocation(0, mXICFontSize);
}
}
if (mXIC) {
nsWidget* parent = (nsWidget*)mParent.get();
if (parent) {
parent->mIMEChildWidget = this;
}
}
return;
}
#endif // USE_XIM
@ -3189,10 +3196,11 @@ nsWidget::IMESetFocusWidget()
PrimeICSpotTimer();
}
} else {
// FIXME: we shouldn't call UnsetFocusWidget() when focus
// is moved to toolbar or SetFocusWidget() again to
// input Widget (bug 17419)
if (mIMEChildWidget) {
IMEActivateWidget();
mIMEChildWidget->IMESetFocusWidget();
return;
}
// kinput2 does not work well if we call UnsetFocusWidget()
// when mIMEIsDeactivating is true
if (mIMEShellWidget->mIMEIsDeactivating == PR_FALSE) {

1
widget/src/gtk/nsWidget.h
View File

@ -364,6 +364,7 @@ public:
void IMEDeactivateWidget();
void IMEActivateWidget();
void IMEDestroyIC();
nsWidget* mIMEChildWidget;
#endif // USE_XIM
protected:
void IMEComposeStart(guint aTime);