From 9ff5b886fade489b7cc268626f518145650f6b2c Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 23 Feb 2023 10:39:28 +0100 Subject: [PATCH] Windows drag&drop: Use correct window for drag target processing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GetFocus will return the window that currently has keyboard focus. This is not what we want for drag and drop handling though. Use the window under mouse and process events for that window when doing the touch/pen input workaround. If no window is found we fall back to the focus window. Followup to 31e7790102b260344893eaa8bf8b7b1a0f95e3b7 Fixes: QTBUG-111149 Change-Id: Ib8233debc267df0cc19b21c1dc5c6881d018d84a Reviewed-by: Timothée Keller Reviewed-by: Friedemann Kleint (cherry picked from commit c912bde52a1b85a782db6aed8d6f9917d597f58b) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/windows/qwindowsdrag.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index 93205259f8e..48e0bba41ff 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -648,7 +648,8 @@ IDropTargetHelper* QWindowsDrag::dropHelper() { // We process pointer messages for touch/pen and generate mouse input through SendInput() to trigger DoDragDrop() static HRESULT startDoDragDrop(LPDATAOBJECT pDataObj, LPDROPSOURCE pDropSource, DWORD dwOKEffects, LPDWORD pdwEffect) { - HWND hwnd = ::GetFocus(); + QWindow *underMouse = QWindowsContext::instance()->windowUnderMouse(); + const HWND hwnd = underMouse ? reinterpret_cast(underMouse->winId()) : ::GetFocus(); bool starting = false; for (;;) {