From 5fd6ad510193b2e30c7ffee831d42fd5d15019a4 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 29 Dec 2023 14:17:38 +1000 Subject: [PATCH] wasm: don't call requestActivate for windows that don't want it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QWindows that set Qt::QWindowDoesNotAcceptFocus like QtVirtualKeyboard should not get focus. gets rid of message: requestActivate() called for QtVirtualKeyboard::InputView(0x1cdf130) which has Qt::WindowDoesNotAcceptFocus set. Change-Id: I649a8cff599769727beaeee11039cf1291fd502d Reviewed-by: Morten Johan Sørvig Reviewed-by: Piotr Wierciński (cherry picked from commit e766df030bc1afe7a654baa59efe5165f6b6cda9) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/wasm/qwasmwindowclientarea.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/wasm/qwasmwindowclientarea.cpp b/src/plugins/platforms/wasm/qwasmwindowclientarea.cpp index cc78b8dcd58..4908f6d130d 100644 --- a/src/plugins/platforms/wasm/qwasmwindowclientarea.cpp +++ b/src/plugins/platforms/wasm/qwasmwindowclientarea.cpp @@ -68,7 +68,8 @@ bool ClientArea::processPointer(const PointerEvent &event) switch (event.type) { case EventType::PointerDown: m_element.call("setPointerCapture", event.pointerId); - m_window->window()->requestActivate(); + if ((m_window->window()->flags() & Qt::WindowDoesNotAcceptFocus) != Qt::WindowDoesNotAcceptFocus) + m_window->window()->requestActivate(); break; case EventType::PointerUp: m_element.call("releasePointerCapture", event.pointerId);