Improve mouse cursor hiding consistency when the pointer is captured.

This fixes issues under Wayland when dragging the 2D and 3D views.
codereader · Mar 22, 2024 · ee57da9 · ee57da9
1 parent 9a9c014
commit ee57da9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/libs/wxutil/FreezePointer.cpp b/libs/wxutil/FreezePointer.cpp
@@ -28,7 +28,7 @@ void FreezePointer::startCapture(wxWindow* window,
 
     if (_hidePointer)
     {
-        topLevel->SetCursor(wxCursor(wxCURSOR_BLANK));
+        window->SetCursor(wxCursor(wxCURSOR_BLANK));
     }
 
     // We capture the mouse on the toplevel app, coordinates
@@ -92,7 +92,7 @@ void FreezePointer::endCapture()
 
     if (_hidePointer)
     {
-        topLevel->SetCursor(wxCursor(wxCURSOR_DEFAULT));
+        window->SetCursor(wxCursor(wxCURSOR_DEFAULT));
     }
 
     if (topLevel->HasCapture())

diff --git a/radiant/xyview/OrthoView.cpp b/radiant/xyview/OrthoView.cpp
@@ -423,6 +423,9 @@ bool OrthoView::checkChaseMouse(unsigned int state)
 
 void OrthoView::setCursorType(CursorType type)
 {
+    if (_freezePointer.isCapturing(_wxGLWidget))
+        return;
+
     switch (type)
 	{
     case CursorType::Pointer: