Windows: Don't send non-client mouse events unless frameStrutEventsEnabled
During refactoring in 38504041148f2d1cffea6520ea448dd4171adb0b the logic was changed in a way that ended up sending non-client mouse events even if frameStrutEventsEnabled() was not set on the platform window. Change-Id: Icbde51641020aeec99572d80859082fdcf656311 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit f1e539518b595e48f2e1e6a8eec1263b47148e3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
a555d11289
commit
16ce5c2a4f
@ -1141,12 +1141,16 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
|
|||||||
case QtWindows::ExposeEvent:
|
case QtWindows::ExposeEvent:
|
||||||
return platformWindow->handleWmPaint(hwnd, message, wParam, lParam, result);
|
return platformWindow->handleWmPaint(hwnd, message, wParam, lParam, result);
|
||||||
case QtWindows::NonClientMouseEvent:
|
case QtWindows::NonClientMouseEvent:
|
||||||
if ((d->m_systemInfo & QWindowsContext::SI_SupportsPointer) && platformWindow->frameStrutEventsEnabled())
|
if (!platformWindow->frameStrutEventsEnabled())
|
||||||
|
break;
|
||||||
|
if ((d->m_systemInfo & QWindowsContext::SI_SupportsPointer))
|
||||||
return sessionManagerInteractionBlocked() || d->m_pointerHandler.translateMouseEvent(platformWindow->window(), hwnd, et, msg, result);
|
return sessionManagerInteractionBlocked() || d->m_pointerHandler.translateMouseEvent(platformWindow->window(), hwnd, et, msg, result);
|
||||||
else
|
else
|
||||||
return sessionManagerInteractionBlocked() || d->m_mouseHandler.translateMouseEvent(platformWindow->window(), hwnd, et, msg, result);
|
return sessionManagerInteractionBlocked() || d->m_mouseHandler.translateMouseEvent(platformWindow->window(), hwnd, et, msg, result);
|
||||||
case QtWindows::NonClientPointerEvent:
|
case QtWindows::NonClientPointerEvent:
|
||||||
if ((d->m_systemInfo & QWindowsContext::SI_SupportsPointer) && platformWindow->frameStrutEventsEnabled())
|
if (!platformWindow->frameStrutEventsEnabled())
|
||||||
|
break;
|
||||||
|
if ((d->m_systemInfo & QWindowsContext::SI_SupportsPointer))
|
||||||
return sessionManagerInteractionBlocked() || d->m_pointerHandler.translatePointerEvent(platformWindow->window(), hwnd, et, msg, result);
|
return sessionManagerInteractionBlocked() || d->m_pointerHandler.translatePointerEvent(platformWindow->window(), hwnd, et, msg, result);
|
||||||
break;
|
break;
|
||||||
case QtWindows::EnterSizeMoveEvent:
|
case QtWindows::EnterSizeMoveEvent:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user