1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid QWindow crashing in mapToGlobal when no platformWindow

Browse Source 
Add f60fb8f41741c2ca4dbd02b70d56e561be64d673 also to mapToGlobal.

Amends 67fa2585ac48e64972d1c0a20b3add5c3ef72e51

Avoids crashing in certain applications that use QQuickRenderControl
and QQuickWindows that are not backed by a QPlatformWindow.

Change-Id: Ie4a8bd7837973e7997f9b668f776ca2999147d75
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Laszlo Agocs 2023-12-06 17:53:59 +01:00
parent fa79b56bd8
commit 11e524d0cc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/kernel/qwindow.cpp
View File

@ -2850,7 +2850,12 @@ QPointF QWindow::mapToGlobal(const QPointF &pos) const
// Map the position (and the window's global position) to native coordinates, perform // Map the position (and the window's global position) to native coordinates, perform
// the addition, and then map back to device independent coordinates. // the addition, and then map back to device independent coordinates.
QPointF nativeLocalPos = QHighDpi::toNativeLocalPosition(pos, this); QPointF nativeLocalPos = QHighDpi::toNativeLocalPosition(pos, this);
QPointF nativeWindowGlobalPos = d->platformWindow->mapToGlobal(QPoint(0,0)).toPointF(); // Get the native window position directly from the platform window
// if available (it can be null if the window hasn't been shown yet),
// or fall back to scaling the QWindow position.
QPointF nativeWindowGlobalPos = d->platformWindow
? d->platformWindow->mapToGlobal(QPoint(0,0)).toPointF()
: QHighDpi::toNativeGlobalPosition(QPointF(d->globalPosition()), this);
QPointF nativeGlobalPos = nativeLocalPos + nativeWindowGlobalPos; QPointF nativeGlobalPos = nativeLocalPos + nativeWindowGlobalPos;
QPointF deviceIndependentGlobalPos = QHighDpi::fromNativeGlobalPosition(nativeGlobalPos, this); QPointF deviceIndependentGlobalPos = QHighDpi::fromNativeGlobalPosition(nativeGlobalPos, this);
return deviceIndependentGlobalPos; return deviceIndependentGlobalPos;