[qtmozembed] Fix input method state handling. Fixes JB#37182

sailfishos · Dec 11, 2018 · 33f4e6b · 33f4e6b
1 parent 23b7125
commit 33f4e6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/qmozview_p.cpp b/src/qmozview_p.cpp
@@ -836,9 +836,12 @@ void QMozViewPrivate::IMENotification(int aIstate, bool aOpen, int aCause, int a
     mViewIface->imeNotification(aIstate, aOpen, aCause, aFocusChange, imType);
 }
 
-void QMozViewPrivate::GetIMEStatus(int32_t *aIMEEnabled, int32_t *aIMEOpen, intptr_t *aNativeIMEContext)
+void QMozViewPrivate::GetIMEStatus(int32_t *aIMEEnabled, int32_t *aIMEOpen)
 {
-    *aNativeIMEContext = (intptr_t)qApp->inputMethod();
+    QInputMethod *inputContext = qGuiApp->inputMethod();
+    if (aIMEOpen) {
+        *aIMEOpen = inputContext->isVisible();
+    }
 }
 
 void QMozViewPrivate::OnTitleChanged(const char16_t *aTitle)

diff --git a/src/qmozview_p.h b/src/qmozview_p.h
@@ -60,7 +60,7 @@ class QMozViewPrivate : public QObject,
     void OnSecurityChanged(const char *aStatus, unsigned int aState) override;
     void OnFirstPaint(int32_t aX, int32_t aY) override;
     void OnScrolledAreaChanged(unsigned int aWidth, unsigned int aHeight) override;
-    void GetIMEStatus(int32_t *aIMEEnabled, int32_t *aIMEOpen, intptr_t *aNativeIMEContext) override;
+    void GetIMEStatus(int32_t *aIMEEnabled, int32_t *aIMEOpen) override;
     void IMENotification(int aIstate, bool aOpen, int aCause, int aFocusChange,
                          const char16_t *inputType, const char16_t *inputMode) override;
     void OnTitleChanged(const char16_t *aTitle) override;