AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasm: do not allow blocked windows to be resized

Browse Source 
Fixes: QTBUG-102869
Pick-to: 6.3 6.4
Change-Id: I69a4afbb67618dce7bcc499208e7e608e9adf212
Reviewed-by: David Skoland <david.skoland@qt.io>
This commit is contained in:
Lorn Potter 2022-04-27 11:21:36 +10:00
parent e114fec62a
commit cf9cd8cc08
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/wasm/qwasmcompositor.cpp
View File

@ -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()) {