fix notifying layout changed without IME window on Firefox 44.0

nathancorvussolis · Jan 31, 2016 · 060f886 · 060f886
1 parent f25c703
commit 060f886
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/imcrvtip/CandidateList.cpp b/imcrvtip/CandidateList.cpp
@@ -381,8 +381,25 @@ void CCandidateList::_InvokeSfHandler(BYTE sf)
 	}
 }
 
+void CCandidateList::_PreEndCandidateList()
+{
+	_UnadviseTextLayoutSink();
+
+	_UnadviseContextKeyEventSink();
+
+	if(_pDocumentMgr != NULL)
+	{
+		_pDocumentMgr->Pop(0);
+	}
+
+	SafeRelease(&_pContextCandidateWindow);
+	SafeRelease(&_pDocumentMgr);
+}
+
 void CCandidateList::_EndCandidateList()
 {
+	_PreEndCandidateList();
+
 	if(_pCandidateWindow != NULL)
 	{
 		_pCandidateWindow->_EndUIElement();
@@ -391,18 +408,7 @@ void CCandidateList::_EndCandidateList()
 	SafeRelease(&_pCandidateWindow);
 
 	SafeRelease(&_pRangeComposition);
-
-	_UnadviseContextKeyEventSink();
-	SafeRelease(&_pContextCandidateWindow);
-
-	_UnadviseTextLayoutSink();
 	SafeRelease(&_pContextDocument);
-
-	if(_pDocumentMgr != NULL)
-	{
-		_pDocumentMgr->Pop(0);
-	}
-	SafeRelease(&_pDocumentMgr);
 }
 
 BOOL CCandidateList::_IsShowCandidateWindow()

diff --git a/imcrvtip/CandidateList.h b/imcrvtip/CandidateList.h
@@ -28,6 +28,7 @@ class CCandidateList :
 
 	HRESULT _StartCandidateList(TfClientId tid, ITfDocumentMgr *pDocumentMgr,
 		ITfContext *pContext, TfEditCookie ec, ITfRange *pRange, BOOL reg, BOOL comp);
+	void _PreEndCandidateList();
 	void _EndCandidateList();
 
 	BOOL _IsShowCandidateWindow();

diff --git a/imcrvtip/CandidateWindow.cpp b/imcrvtip/CandidateWindow.cpp
@@ -1202,6 +1202,14 @@ void CCandidateWindow::_Update()
 
 void CCandidateWindow::_EndCandidateList(BYTE sf)
 {
+	if(!_comp)
+	{
+		if(_pCandidateList != NULL)
+		{
+			_pCandidateList->_PreEndCandidateList();
+		}
+	}
+
 	_InvokeSfHandler(sf);
 
 	if(_pTextService != NULL)

diff --git a/imcrvtip/KeyHandlerChar.cpp b/imcrvtip/KeyHandlerChar.cpp
@@ -310,6 +310,11 @@ HRESULT CTextService::_HandleCharReturn(TfEditCookie ec, ITfContext *pContext, B
 
 HRESULT CTextService::_HandleCharShift(TfEditCookie ec, ITfContext *pContext)
 {
+	if(!showentry && kana.empty() && roman.empty())
+	{
+		_EndCompletionList(ec, pContext);
+	}
+
 	if(showentry || (!inputkey && !kana.empty() && roman.empty()))
 	{
 		_EndCompletionList(ec, pContext);