Bug 1468917 - part 1: Make TSFTextStore not create native caret if ATOK 2016 is active r?m_kato
Old ATOK referred native caret position to decide its candidate window position.
However, at least ATOK 2016 does not need to refer it. Additionally, if we
create native caret for ATOK 2016, the candidate window position, ATOK 2016
refers the native caret only when we cannot return expected rect. Therefore,
only immediately after modifying composition string, the position is different
from actual position by a couple of pixels and that looks like flicks the
candidate window.
So, we should stop creating native caret for ATOK 2016 (as same as ATOK 2017).
MozReview-Commit-ID: LsmVXCmRIzc
--- a/widget/windows/TSFTextStore.cpp
+++ b/widget/windows/TSFTextStore.cpp
@@ -1127,18 +1127,17 @@ public:
NS_WARN_IF(!staticSink->EnsureInitActiveTIPKeyboard())) {
return false;
}
return staticSink->IsATOKActiveInternal() &&
(staticSink->IsATOK2011ActiveInternal() ||
staticSink->IsATOK2012ActiveInternal() ||
staticSink->IsATOK2013ActiveInternal() ||
staticSink->IsATOK2014ActiveInternal() ||
- staticSink->IsATOK2015ActiveInternal() ||
- staticSink->IsATOK2016ActiveInternal());
+ staticSink->IsATOK2015ActiveInternal());
}
private:
/****************************************************************************
* Japanese TIP
****************************************************************************/
// Note that TIP name may depend on the language of the environment.