From d0505695dd7100412db442824b6b09b7b801fc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= Date: Mon, 27 Jun 2022 17:47:00 +0200 Subject: 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 Reviewed-by: Shawn Rutledge --- src/widgets/widgets/qdockwidget.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3