summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wasm/qwasmwindowclientarea.cpp
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2023-12-29 14:17:38 +1000
committerLorn Potter <lorn.potter@gmail.com>2024-01-10 05:44:16 +0000
commite766df030bc1afe7a654baa59efe5165f6b6cda9 (patch)
treee3673b1b56626e6621da7e2fed3385ea6437375d /src/plugins/platforms/wasm/qwasmwindowclientarea.cpp
parentb1e5d9275d4cf6152e4e9456b1bc2d585a5512e2 (diff)
wasm: don't call requestActivate for windows that don't want it
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. Pick-to: 6.7 Change-Id: I649a8cff599769727beaeee11039cf1291fd502d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmwindowclientarea.cpp')
-rw-r--r--src/plugins/platforms/wasm/qwasmwindowclientarea.cpp3
1 files changed, 2 insertions, 1 deletions
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<void>("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<void>("releasePointerCapture", event.pointerId);