Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: If4974bbf0a166de244dd57cb71b05fa28bcc34ce

6 files changed, 39 insertions, 30 deletions

diff --git a/src/plugins/platforms/cocoa/qnsview_drawing.mm b/src/plugins/platforms/cocoa/qnsview_drawing.mm
index f7e14b7883..cb1799b039 100644
--- a/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ b/src/plugins/platforms/cocoa/qnsview_drawing.mm
@@ -163,12 +163,14 @@
     return NSViewLayerContentsRedrawDuringViewResize;
 }
 
+#if 0 // Disabled until we enable lazy backingstore resizing
 - (NSViewLayerContentsPlacement)layerContentsPlacement
 {
     // Always place the layer at top left without any automatic scaling,
     // so that we can re-use larger layers when resizing a window down.
     return NSViewLayerContentsPlacementTopLeft;
 }
+#endif
 
 - (void)updateMetalLayerDrawableSize:(CAMetalLayer *)layer
 {
diff --git a/src/plugins/platforms/wasm/qtloader.js b/src/plugins/platforms/wasm/qtloader.js
index 3cbb1c8aa8..2db7723ae2 100644
--- a/src/plugins/platforms/wasm/qtloader.js
+++ b/src/plugins/platforms/wasm/qtloader.js
@@ -164,6 +164,7 @@ function QtLoader(config)
         // Set contentEditable in order to enable clipboard events; hide the resulting focus frame.
         canvas.contentEditable = true;
         canvas.style.outline = "0px solid transparent";
+        canvas.style.caretColor = "transparent";
         canvas.style.cursor = "default";
 
         return canvas;
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index 90cc20789d..e6a69c4814 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -193,7 +193,7 @@ void QWasmCompositor::requestRedraw()
     QCoreApplication::postEvent(this, new QEvent(QEvent::UpdateRequest));
 }
 
-QWindow *QWasmCompositor::windowAt(QPoint p, int padding) const
+QWindow *QWasmCompositor::windowAt(QPoint globalPoint, int padding) const
 {
     int index = m_windowStack.count() - 1;
     // qDebug() << "window at" << "point" << p << "window count" << index;
@@ -205,7 +205,7 @@ QWindow *QWasmCompositor::windowAt(QPoint p, int padding) const
         QRect geometry = compositedWindow.window->windowFrameGeometry()
                          .adjusted(-padding, -padding, padding, padding);
 
-        if (compositedWindow.visible && geometry.contains(p))
+        if (compositedWindow.visible && geometry.contains(globalPoint))
             return m_windowStack.at(index)->window();
         --index;
     }
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h
index ed6facdcc3..3104573073 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.h
+++ b/src/plugins/platforms/wasm/qwasmcompositor.h
@@ -116,7 +116,7 @@ public:
     void redrawWindowContent();
     void requestRedraw();
 
-    QWindow *windowAt(QPoint p, int padding = 0) const;
+    QWindow *windowAt(QPoint globalPoint, int padding = 0) const;
     QWindow *keyWindow() const;
 
     bool event(QEvent *event);
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index 1c4c8cb7e8..f4ca49997a 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -549,22 +549,22 @@ void resizeWindow(QWindow *window, QWasmWindow::ResizeMode mode,
 void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEvent *mouseEvent)
 {
     auto timestamp = mouseEvent->timestamp;
-    QPoint point(mouseEvent->targetX, mouseEvent->targetY);
+    QPoint targetPoint(mouseEvent->targetX, mouseEvent->targetY);
+    QPoint globalPoint = screen()->geometry().topLeft() + targetPoint;
 
     QEvent::Type buttonEventType = QEvent::None;
-
     Qt::MouseButton button = translateMouseButton(mouseEvent->button);
     Qt::KeyboardModifiers modifiers = translateMouseEventModifier(mouseEvent);
 
-    QWindow *window2 = screen()->compositor()->windowAt(point, 5);
-    if (window2 != nullptr)
-        lastWindow = window2;
-
-    QWasmWindow *htmlWindow = static_cast<QWasmWindow*>(window2->handle());
+    QWindow *window2 = screen()->compositor()->windowAt(globalPoint, 5);
+    if (window2 == nullptr)
+        return;
+    lastWindow = window2;
 
-    bool interior = window2 && window2->geometry().contains(point);
+    QPoint localPoint = window2->mapFromGlobal(globalPoint);
+    bool interior = window2->geometry().contains(globalPoint);
 
-    QPoint localPoint(point.x() - window2->geometry().x(), point.y() - window2->geometry().y());
+    QWasmWindow *htmlWindow = static_cast<QWasmWindow*>(window2->handle());
     switch (eventType) {
     case EMSCRIPTEN_EVENT_MOUSEDOWN:
     {
@@ -580,18 +580,18 @@ void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEven
             pressedWindow = window2;
             buttonEventType = QEvent::MouseButtonPress;
             if (!(htmlWindow->m_windowState & Qt::WindowFullScreen) && !(htmlWindow->m_windowState & Qt::WindowMaximized)) {
-                if (htmlWindow && window2->flags().testFlag(Qt::WindowTitleHint) && htmlWindow->isPointOnTitle(point))
+                if (htmlWindow && window2->flags().testFlag(Qt::WindowTitleHint) && htmlWindow->isPointOnTitle(globalPoint))
                     draggedWindow = window2;
-                else if (htmlWindow && htmlWindow->isPointOnResizeRegion(point)) {
+                else if (htmlWindow && htmlWindow->isPointOnResizeRegion(globalPoint)) {
                     draggedWindow = window2;
-                    resizeMode = htmlWindow->resizeModeAtPoint(point);
-                    resizePoint = point;
+                    resizeMode = htmlWindow->resizeModeAtPoint(globalPoint);
+                    resizePoint = globalPoint;
                     resizeStartRect = window2->geometry();
                 }
             }
         }
 
-        htmlWindow->injectMousePressed(localPoint, point, button, modifiers);
+        htmlWindow->injectMousePressed(localPoint, globalPoint, button, modifiers);
         break;
     }
     case EMSCRIPTEN_EVENT_MOUSEUP:
@@ -611,7 +611,7 @@ void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEven
         }
 
         if (oldWindow)
-            oldWindow->injectMouseReleased(localPoint, point, button, modifiers);
+            oldWindow->injectMouseReleased(localPoint, globalPoint, button, modifiers);
         break;
     }
     case EMSCRIPTEN_EVENT_MOUSEMOVE: // drag event
@@ -640,7 +640,7 @@ void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEven
     }
     if (window2 && interior) {
         QWindowSystemInterface::handleMouseEvent<QWindowSystemInterface::SynchronousDelivery>(
-            window2, timestamp, localPoint, point, pressedButtons, button, buttonEventType, modifiers);
+            window2, timestamp, localPoint, globalPoint, pressedButtons, button, buttonEventType, modifiers);
     }
 }
 
@@ -675,11 +675,13 @@ int QWasmEventTranslator::wheel_cb(int eventType, const EmscriptenWheelEvent *wh
     QWasmEventTranslator *translator = (QWasmEventTranslator*)userData;
     Qt::KeyboardModifiers modifiers = translator->translateMouseEventModifier(&mouseEvent);
     auto timestamp = mouseEvent.timestamp;
-    QPoint globalPoint(mouseEvent.canvasX, mouseEvent.canvasY);
+    QPoint targetPoint(mouseEvent.targetX, mouseEvent.targetY);
+    QPoint globalPoint = eventTranslator->screen()->geometry().topLeft() + targetPoint;
 
     QWindow *window2 = eventTranslator->screen()->compositor()->windowAt(globalPoint, 5);
-
-    QPoint localPoint(globalPoint.x() - window2->geometry().x(), globalPoint.y() - window2->geometry().y());
+    if (!window2)
+        return 0;
+    QPoint localPoint = window2->mapFromGlobal(globalPoint);
 
     QPoint pixelDelta;
 
@@ -709,24 +711,28 @@ int QWasmEventTranslator::handleTouch(int eventType, const EmscriptenTouchEvent
 
         const EmscriptenTouchPoint *touches = &touchEvent->touches[i];
 
-        QPoint point(touches->targetX, touches->targetY);
-        window2 = this->screen()->compositor()->windowAt(point, 5);
+        QPoint targetPoint(touches->targetX, touches->targetY);
+        QPoint globalPoint = screen()->geometry().topLeft() + targetPoint;
+
+        window2 = this->screen()->compositor()->windowAt(globalPoint, 5);
+        if (window2 == nullptr)
+            continue;
+
         QWindowSystemInterface::TouchPoint touchPoint;
 
         touchPoint.area = QRect(0, 0, 8, 8);
         touchPoint.id = touches->identifier;
         touchPoint.pressure = 1.0;
 
-        const QPointF screenPos(point);
-
-        touchPoint.area.moveCenter(screenPos);
+        touchPoint.area.moveCenter(globalPoint);
 
         const auto tp = pressedTouchIds.constFind(touchPoint.id);
         if (tp != pressedTouchIds.constEnd())
             touchPoint.normalPosition = tp.value();
 
-        QPointF normalPosition(screenPos.x() / window2->width(),
-                               screenPos.y() / window2->height());
+        QPointF localPoint = QPointF(window2->mapFromGlobal(globalPoint));
+        QPointF normalPosition(localPoint.x() / window2->width(),
+                               localPoint.y() / window2->height());
 
         const bool stationaryTouchPoint = (normalPosition == touchPoint.normalPosition);
         touchPoint.normalPosition = normalPosition;
diff --git a/src/plugins/platforms/wasm/wasm_shell.html b/src/plugins/platforms/wasm/wasm_shell.html
index 6ad7886ed4..f7c856d63d 100644
--- a/src/plugins/platforms/wasm/wasm_shell.html
+++ b/src/plugins/platforms/wasm/wasm_shell.html
@@ -11,7 +11,7 @@
       /* The contenteditable property is set to true for the canvas in order to support
          clipboard events. Hide the resulting focus frame and set the cursor back to
          the default cursor. */
-      canvas { outline: 0px solid transparent; cursor:default }
+      canvas { outline: 0px solid transparent; caret-color: transparent; cursor:default }
     </style>
   </head>
   <body onload="init()">