diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2022-04-27 11:21:36 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2022-06-22 20:04:35 +1000 |
| commit | cf9cd8cc081397d08f48b6ae0d9380b11f4929dd (patch) | |
| tree | 0f3e857cf91d511dbc9d53e37b43159da6084821 | |
| parent | e114fec62adf13b8c21ca890fb748cb27f391c25 (diff) | |
wasm: do not allow blocked windows to be resized
Fixes: QTBUG-102869
Pick-to: 6.3 6.4
Change-Id: I69a4afbb67618dce7bcc499208e7e608e9adf212
Reviewed-by: David Skoland <david.skoland@qt.io>
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmcompositor.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 676ed6c4d0..7787367e01 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -995,6 +995,7 @@ bool QWasmCompositor::processMouse(int eventType, const EmscriptenMouseEvent *mo QPoint localPoint = window2->mapFromGlobal(globalPoint); bool interior = window2->geometry().contains(globalPoint); + bool blocked = QGuiApplicationPrivate::instance()->isWindowBlocked(window2); if (mouseInCanvas) { if (windowUnderMouse != window2 && interior) { @@ -1005,6 +1006,10 @@ bool QWasmCompositor::processMouse(int eventType, const EmscriptenMouseEvent *mo } QWasmWindow *htmlWindow = static_cast<QWasmWindow*>(window2->handle()); + Qt::WindowStates windowState = htmlWindow->window()->windowState(); + bool isResizable = !(windowState.testFlag(Qt::WindowMaximized) || + windowState.testFlag(Qt::WindowFullScreen)); + switch (eventType) { case EMSCRIPTEN_EVENT_MOUSEDOWN: { @@ -1024,8 +1029,10 @@ bool QWasmCompositor::processMouse(int eventType, const EmscriptenMouseEvent *mo // 2 = right mouse button, usually right click // from: https://w3c.github.io/uievents/#dom-mouseevent-button if (mouseEvent->button == 0) { - if (!(htmlWindow->m_windowState & Qt::WindowFullScreen) && !(htmlWindow->m_windowState & Qt::WindowMaximized)) { - if (htmlWindow && window2->flags().testFlag(Qt::WindowTitleHint) && htmlWindow->isPointOnTitle(globalPoint)) + if (!blocked && !(htmlWindow->m_windowState & Qt::WindowFullScreen) + && !(htmlWindow->m_windowState & Qt::WindowMaximized)) { + if (htmlWindow && window2->flags().testFlag(Qt::WindowTitleHint) + && htmlWindow->isPointOnTitle(globalPoint)) draggedWindow = window2; else if (htmlWindow && htmlWindow->isPointOnResizeRegion(globalPoint)) { draggedWindow = window2; @@ -1068,11 +1075,9 @@ bool QWasmCompositor::processMouse(int eventType, const EmscriptenMouseEvent *mo if (htmlWindow && pressedButtons.testFlag(Qt::NoButton)) { - Qt::WindowStates windowState = htmlWindow->window()->windowState(); - bool isResizable = !(windowState.testFlag(Qt::WindowMaximized) || windowState.testFlag(Qt::WindowFullScreen)); bool isOnResizeRegion = htmlWindow->isPointOnResizeRegion(globalPoint); - if (isResizable && isOnResizeRegion) { + if (isResizable && isOnResizeRegion && !blocked) { QCursor resizingCursor = eventTranslator->cursorForMode(htmlWindow->resizeModeAtPoint(globalPoint)); if (resizingCursor != window2->cursor()) { |