From 8694d9f9b427c633df99fb9c67caa3b264b6725c Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 30 Nov 2022 18:06:39 +0100 Subject: [PATCH] Fix helper mouse button up event on drag drop end on Windows Regression from 4efd411045439dbc92ee39c6be43de0a5d039a70 --- Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp b/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp index e836f3e21..3bb697208 100644 --- a/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp +++ b/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp @@ -8,6 +8,7 @@ #include "Engine/Core/Collections/Array.h" #include "Engine/Engine/Engine.h" +#include "Engine/Engine/Screen.h" #include "Engine/Platform/IGuiData.h" #include "Engine/Input/Input.h" #include "Engine/Input/Mouse.h" @@ -621,7 +622,11 @@ DragDropEffect WindowsWindow::DoDragDrop(const StringView& data) // Fix hanging mouse state (Windows doesn't send WM_LBUTTONUP when we end the drag and drop) if (Input::GetMouseButton(MouseButton::Left)) - Input::Mouse->OnMouseUp(Input::Mouse->GetPosition(), MouseButton::Left, this); + { + ::POINT point; + ::GetCursorPos(&point); + Input::Mouse->OnMouseUp(Float2((float)point.x, (float)point.y), MouseButton::Left, this); + } return SUCCEEDED(result) ? dropEffectFromOleEnum(dwEffect) : DragDropEffect::None; }