From adebdd0f9af0ffe47250b4a273407b84a6c61879 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Tue, 6 Sep 2022 12:56:42 +0200 Subject: Propagate the copy event correctly to Qt widgets on WASM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The event should be propagated when the native clipboard is available. A recent regression caused it to be suppressed, which resulted in lack of copy/paste capabilities. Pick-to: 6.4 6.4.0 Change-Id: I030a31aa0951c3813ce1d38da9a6526010b3bfc8 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmclipboard.cpp | 15 +++++++++++++++ src/plugins/platforms/wasm/qwasmclipboard.h | 4 ++++ src/plugins/platforms/wasm/qwasmcompositor.cpp | 9 ++------- 3 files changed, 21 insertions(+), 7 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp index 97a0547563..d290fe245b 100644 --- a/src/plugins/platforms/wasm/qwasmclipboard.cpp +++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp @@ -183,6 +183,21 @@ void QWasmClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode) isPaste = false; } +bool QWasmClipboard::processKeyboard(const QWasmEventTranslator::TranslatedEvent &event, + const QFlags &modifiers) +{ + // Clipboard path: cut/copy/paste are handled by clipboard event or direct clipboard + // access. + if (hasClipboardApi) + return false; + if (event.type != QEvent::KeyPress || !modifiers.testFlag(Qt::ControlModifier) + || (event.key != Qt::Key_C && event.key != Qt::Key_V && event.key != Qt::Key_X)) { + return false; + } + isPaste = event.key == Qt::Key_V; + return true; +} + bool QWasmClipboard::supportsMode(QClipboard::Mode mode) const { return mode == QClipboard::Clipboard; diff --git a/src/plugins/platforms/wasm/qwasmclipboard.h b/src/plugins/platforms/wasm/qwasmclipboard.h index 3aafb1eec8..24dad06127 100644 --- a/src/plugins/platforms/wasm/qwasmclipboard.h +++ b/src/plugins/platforms/wasm/qwasmclipboard.h @@ -12,6 +12,8 @@ #include #include +#include "qwasmeventtranslator.h" + QT_BEGIN_NAMESPACE class QWasmClipboard : public QObject, public QPlatformClipboard @@ -27,6 +29,8 @@ public: bool ownsMode(QClipboard::Mode mode) const override; static void qWasmClipboardPaste(QMimeData *mData); + bool processKeyboard(const QWasmEventTranslator::TranslatedEvent &event, + const QFlags &modifiers); void initClipboardPermissions(); void installEventHandlers(const emscripten::val &canvas); bool hasClipboardApi; diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 5ba8688ff1..ccf7bd9356 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -829,13 +829,8 @@ bool QWasmCompositor::processKeyboard(int eventType, const EmscriptenKeyboardEve const QFlags modifiers = KeyboardModifier::getForEvent(*emKeyEvent); - // Clipboard path: cut/copy/paste are handled by clipboard event or direct clipboard access. - if (translatedEvent.type == QEvent::KeyPress && modifiers.testFlag(Qt::ControlModifier) - && (translatedEvent.key == Qt::Key_X || translatedEvent.key == Qt::Key_V - || translatedEvent.key == Qt::Key_C)) { - QWasmIntegration::get()->getWasmClipboard()->isPaste = translatedEvent.key == Qt::Key_V; - return false; // continue on to event - } + if (QWasmIntegration::get()->getWasmClipboard()->processKeyboard(translatedEvent, modifiers)) + return false; if (translatedEvent.text.isEmpty()) translatedEvent.text = QString(emKeyEvent->key); -- cgit v1.2.3