diff options
| author | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2022-06-27 17:47:00 +0200 |
|---|---|---|
| committer | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2022-07-05 06:51:26 +0200 |
| commit | d0505695dd7100412db442824b6b09b7b801fc38 (patch) | |
| tree | b518ecab6ff42a6e115efaebc3fc10b3f3072ee9 | |
| parent | 76b07b05f0dee0ff412910a45c600ca3ffb7fc23 (diff) | |
QDockWidget warning log for an unexpected situation
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>
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 14022aa830..ec5e4d51d5 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1002,11 +1002,14 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event) // Calculate new nativePos based on startPos + mouse delta move. const QPoint nativeNewPos = nativeWdgOrgPos + (nativeTo - nativeFrom); - pos = QHighDpiScaling::mapPositionFromNative(nativeNewPos, wdgScreen->handle()) - windowMarginOffset; } else { // 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; } |