Merge pull request #37 from sailfishos/jb56870

[qtmozembed] Fix text input with xt9. JB#56870
sailfishos · Jan 18, 2022 · e781135 · e781135
2 parents 6c64fdf + fb90d55
commit e781135
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/qmozview_p.cpp b/src/qmozview_p.cpp
@@ -657,7 +657,6 @@ void QMozViewPrivate::inputMethodEvent(QInputMethodEvent *event)
                             << ", replSt:" << event->replacementStart();
 #endif
 
-    mPreedit = !event->preeditString().isEmpty();
     if (mViewInitialized) {
         uint16_t charCode = (event->commitString().size() == 1 && event->commitString()[0].isPrint())
                           ? (int32_t)event->commitString()[0].unicode()
@@ -671,14 +670,15 @@ void QMozViewPrivate::inputMethodEvent(QInputMethodEvent *event)
             qGuiApp->inputMethod()->reset();
 
         } else {
-            if (event->commitString().isEmpty() || event->commitString().size() > 1) {
+            if (mPreedit || event->commitString().isEmpty() || event->commitString().size() > 1) {
                 mView->SendTextEvent(event->commitString().toUtf8().data(), event->preeditString().toUtf8().data(), event->replacementStart(), event->replacementLength());
             } else {
                 mView->SendKeyPress(0, 0, charCode);
                 mView->SendKeyRelease(0, 0, charCode);
             }
         }
     }
+    mPreedit = !event->preeditString().isEmpty();
 }
 
 void QMozViewPrivate::keyPressEvent(QKeyEvent *event)