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

Merge branch 'fix-cursor-show-edge-cases' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-cursor-show-edge-cases

Browse Source
This commit is contained in:
Wojtek Figat
2024-06-03 19:17:50 +02:00
parent 0b9ee23a5c f01784108d
commit e8421d4274
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,16 @@ void WindowsWindow::UpdateCursor()
if (!_lastCursorHidden) if (!_lastCursorHidden)
{ {
_lastCursorHidden = true; _lastCursorHidden = true;
::ShowCursor(FALSE); while(::ShowCursor(FALSE) >= 0)
{
if (_cursorHiddenSafetyCount >= 100)
{
LOG(Warning, "Cursor has failed to hide.");
break;
}
_cursorHiddenSafetyCount += 1;
}
_cursorHiddenSafetyCount = 0;
} }
::SetCursor(nullptr); ::SetCursor(nullptr);
return; return;
@@ -786,7 +795,16 @@ void WindowsWindow::UpdateCursor()
else if (_lastCursorHidden) else if (_lastCursorHidden)
{ {
_lastCursorHidden = false; _lastCursorHidden = false;
::ShowCursor(TRUE); while(::ShowCursor(TRUE) < 0)
{
if (_cursorHiddenSafetyCount >= 100)
{
LOG(Warning, "Cursor has failed to show.");
break;
}
_cursorHiddenSafetyCount += 1;
}
_cursorHiddenSafetyCount = 0;
} }
int32 index = 0; int32 index = 0;

1
Source/Engine/Platform/Windows/WindowsWindow.h
View File

@@ -29,6 +29,7 @@ private:
bool _trackingMouse = false; bool _trackingMouse = false;
bool _clipCursorSet = false; bool _clipCursorSet = false;
bool _lastCursorHidden = false; bool _lastCursorHidden = false;
int _cursorHiddenSafetyCount = 0;
bool _isDuringMaximize = false; bool _isDuringMaximize = false;
Windows::HANDLE _monitor = nullptr; Windows::HANDLE _monitor = nullptr;
Windows::LONG _clipCursorRect[4]; Windows::LONG _clipCursorRect[4];