Mostly fixed problem with composition target jumping between input fi…

…elds
tmeshkova · Jan 21, 2013 · 64781fb · 64781fb
1 parent 9fed140
commit 64781fb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -350,6 +350,14 @@ EmbedLiteViewThreadChild::RecvHandleTextEvent(const nsString& commit, const nsSt
     {
         nsCompositionEvent event(true, NS_COMPOSITION_START, widget);
         mHelper->InitEvent(event, nullptr);
+        event.data = commit;
+        mHelper->DispatchWidgetEvent(event);
+    }
+
+    {
+        nsCompositionEvent event(true, NS_COMPOSITION_UPDATE, widget);
+        mHelper->InitEvent(event, nullptr);
+        event.data = commit;
         mHelper->DispatchWidgetEvent(event);
     }
 
@@ -363,6 +371,7 @@ EmbedLiteViewThreadChild::RecvHandleTextEvent(const nsString& commit, const nsSt
     {
         nsCompositionEvent event(true, NS_COMPOSITION_END, widget);
         mHelper->InitEvent(event, nullptr);
+        event.data = commit;
         mHelper->DispatchWidgetEvent(event);
     }
 

diff --git a/embedding/embedlite/tests/qt/qtwidget/qgraphicsmozview.cpp b/embedding/embedlite/tests/qt/qtwidget/qgraphicsmozview.cpp
@@ -616,6 +616,9 @@ void QGraphicsMozView::keyPressEvent(QKeyEvent* event)
     int32_t charCode = 0;
     if (event->text().length() && event->text()[0].isPrint()) {
         charCode = (int32_t)event->text()[0].unicode();
+        if (getenv("USE_TEXT_EVENTS")) {
+            return;
+        }
     }
     d->mView->SendKeyPress(domKeyCode, gmodifiers, charCode);
 }
@@ -631,6 +634,10 @@ void QGraphicsMozView::keyReleaseEvent(QKeyEvent* event)
     int32_t charCode = 0;
     if (event->text().length() && event->text()[0].isPrint()) {
         charCode = (int32_t)event->text()[0].unicode();
+        if (getenv("USE_TEXT_EVENTS")) {
+            d->mView->SendTextEvent(event->text().toUtf8().data(), "");
+            return;
+        }
     }
     d->mView->SendKeyRelease(domKeyCode, gmodifiers, charCode);
 }