GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix StartMouseCapture(true) with secondary monitors on the left

Browse Source 
Yes, negative mouse coordinates are a thing
This commit is contained in:
stefnotch
2021-02-12 22:50:47 +01:00
parent 8158c94d26
commit 311793dd7e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Platform/Base/WindowBase.h
View File

@@ -284,6 +284,7 @@ protected:
Vector2 _trackingMouseOffset; Vector2 _trackingMouseOffset;
bool _isUsingMouseOffset; bool _isUsingMouseOffset;
Rectangle _mouseOffsetScreenSize;
bool _isTrackingMouse; bool _isTrackingMouse;
explicit WindowBase(const CreateWindowSettings& settings); explicit WindowBase(const CreateWindowSettings& settings);

16
Source/Engine/Platform/Windows/WindowsWindow.cpp
View File

@@ -479,6 +479,10 @@ void WindowsWindow::StartTrackingMouse(bool useMouseScreenOffset)
_trackingMouseOffset = Vector2::Zero; _trackingMouseOffset = Vector2::Zero;
_isUsingMouseOffset = useMouseScreenOffset; _isUsingMouseOffset = useMouseScreenOffset;
int32 x = 0 , y = 0, width = 0, height = 0;
GetScreenInfo(x, y, width, height);
_mouseOffsetScreenSize = Rectangle(x, y, width, height);
SetCapture(_handle); SetCapture(_handle);
} }
} }
@@ -712,18 +716,20 @@ LRESULT WindowsWindow::WndProc(UINT msg, WPARAM wParam, LPARAM lParam)
if (_isTrackingMouse && _isUsingMouseOffset) if (_isTrackingMouse && _isUsingMouseOffset)
{ {
// Check if move mouse to another edge of the desktop // Check if move mouse to another edge of the desktop
Vector2 destopSize = Platform::GetVirtualDesktopSize(); Vector2 desktopLocation = _mouseOffsetScreenSize.Location;
Vector2 destopSize = _mouseOffsetScreenSize.GetBottomRight();
const Vector2 mousePos(static_cast<float>(WINDOWS_GET_X_LPARAM(lParam)), static_cast<float>(WINDOWS_GET_Y_LPARAM(lParam))); const Vector2 mousePos(static_cast<float>(WINDOWS_GET_X_LPARAM(lParam)), static_cast<float>(WINDOWS_GET_Y_LPARAM(lParam)));
Vector2 mousePosition = ClientToScreen(mousePos); Vector2 mousePosition = ClientToScreen(mousePos);
Vector2 newMousePosition = mousePosition; Vector2 newMousePosition = mousePosition;
if (mousePosition.X <= 1) if (mousePosition.X <= desktopLocation.X + 2)
newMousePosition.X = destopSize.X - 2; newMousePosition.X = destopSize.X - 2;
else if (mousePosition.X >= destopSize.X - 1) else if (mousePosition.X >= destopSize.X - 1)
newMousePosition.X = 2; newMousePosition.X = desktopLocation.X + 2;
if (mousePosition.Y <= 1) if (mousePosition.Y <= desktopLocation.Y + 2)
newMousePosition.Y = destopSize.Y - 2; newMousePosition.Y = destopSize.Y - 2;
else if (mousePosition.Y >= destopSize.Y - 1) else if (mousePosition.Y >= destopSize.Y - 1)
newMousePosition.Y = 2; newMousePosition.Y = desktopLocation.Y + 2;
if (!Vector2::NearEqual(mousePosition, newMousePosition)) if (!Vector2::NearEqual(mousePosition, newMousePosition))
{ {
_trackingMouseOffset -= newMousePosition - mousePosition; _trackingMouseOffset -= newMousePosition - mousePosition;