Mask DragMode.Move

space-wizards · Feb 2, 2025 · 0eddbc7 · 0eddbc7
1 parent e11a2a6
commit 0eddbc7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -43,7 +43,7 @@ END TEMPLATE-->
 
 ### Bugfixes
 
-*None yet*
+* Fixed `BaseWindow` sometimes not properly updating the mouse cursor shape.
 
 ### Other
 

diff --git a/Robust.Client/UserInterface/CustomControls/BaseWindow.cs b/Robust.Client/UserInterface/CustomControls/BaseWindow.cs
@@ -102,23 +102,25 @@ protected internal override void MouseMove(GUIMouseMoveEventArgs args)
             {
                 var cursor = CursorShape.Arrow;
                 var previewDragMode = GetDragModeFor(args.RelativePosition);
+                previewDragMode &= ~DragMode.Move;
+
                 switch (previewDragMode)
                 {
-                    case var _ when (previewDragMode & (DragMode.Bottom | DragMode.Left)) == (DragMode.Bottom | DragMode.Left):
-                    case var _ when (previewDragMode & (DragMode.Top | DragMode.Right)) == (DragMode.Top | DragMode.Right):
-                        cursor = CursorShape.Crosshair;
-                        break;
-                    case var _ when (previewDragMode & (DragMode.Bottom | DragMode.Right)) == (DragMode.Bottom | DragMode.Right):
-                    case var _ when (previewDragMode & (DragMode.Top | DragMode.Left)) == (DragMode.Top | DragMode.Left):
-                        cursor = CursorShape.Crosshair;
+                    case DragMode.Top:
+                    case DragMode.Bottom:
+                        cursor = CursorShape.VResize;
                         break;
-                    case var _ when (previewDragMode & DragMode.Left) != 0:
-                    case var _ when (previewDragMode & DragMode.Right) != 0:
+
+                    case DragMode.Left:
+                    case DragMode.Right:
                         cursor = CursorShape.HResize;
                         break;
-                    case var _ when (previewDragMode & DragMode.Top) != 0:
-                    case var _ when (previewDragMode & DragMode.Bottom) != 0:
-                        cursor = CursorShape.VResize;
+
+                    case DragMode.Bottom | DragMode.Left:
+                    case DragMode.Top | DragMode.Right:
+                    case DragMode.Bottom | DragMode.Right:
+                    case DragMode.Top | DragMode.Left:
+                        cursor = CursorShape.Crosshair;
                         break;
                 }
 
@@ -157,15 +159,6 @@ protected internal override void MouseMove(GUIMouseMoveEventArgs args)
                 var rect = new UIBox2(left, top, right, bottom);
                 LayoutContainer.SetPosition(this, rect.TopLeft);
                 SetSize = rect.Size;
-
-                /*
-                var timing = IoCManager.Resolve<IGameTiming>();
-
-                var l = GetValue<float>(LayoutContainer.MarginLeftProperty);
-                var t = GetValue<float>(LayoutContainer.MarginTopProperty);
-
-                Logger.Debug($"{timing.CurFrame}: {rect.TopLeft}/({l}, {t}), {rect.Size}/{SetSize}");
-                */
             }
         }