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

QDockWidget warning log for an unexpected situation

Browse Source 
It didn't enter the original patch because it would
prevent it to be backported to 6.2 and 5.15.

Pick-to: 6.3 6.4
Change-Id: I9af30b86b98d5d101b0784cf45781cf46d216c6d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Thorbjørn Lund Martsum 2022-06-27 17:47:00 +02:00
parent 76b07b05f0
commit d0505695dd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/widgets/qdockwidget.cpp
View File

@ -1002,11 +1002,14 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
// Calculate new nativePos based on startPos + mouse delta move. // Calculate new nativePos based on startPos + mouse delta move.
const QPoint nativeNewPos = nativeWdgOrgPos + (nativeTo - nativeFrom); const QPoint nativeNewPos = nativeWdgOrgPos + (nativeTo - nativeFrom);
pos = QHighDpiScaling::mapPositionFromNative(nativeNewPos, wdgScreen->handle()) pos = QHighDpiScaling::mapPositionFromNative(nativeNewPos, wdgScreen->handle())
- windowMarginOffset; - windowMarginOffset;
} else { } else {
// Fallback in the unlikely case that source and target screens could not be established // Fallback in the unlikely case that source and target screens could not be established
qCWarning(lcQpaDockWidgets)
<< "QDockWidget failed to find relevant screen info. screenFrom:" << screenFrom
<< "screenTo:" << screenTo << " wdgScreen:" << wdgScreen << "orgWdgScreen"
<< orgWdgScreen;
pos = event->globalPosition().toPoint() - state->pressPos - windowMarginOffset; pos = event->globalPosition().toPoint() - state->pressPos - windowMarginOffset;
} }