Fixing guidebook not resizable from left and right (#5618)

* Fixing guidebook not resizable from left and right issue 34504 in space-wizards/space-station-14 needs this fix * update fix guideBood not resizable a safer and more error resistent solution to space-wizards/space-station-14#34504 * Mask DragMode.Move --------- Co-authored-by: ElectroJr <[email protected]>
space-wizards · Feb 8, 2025 · d2aa8ec · d2aa8ec
1 parent c4a5752
commit d2aa8ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 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
@@ -103,6 +103,8 @@ protected internal override void MouseMove(GUIMouseMoveEventArgs args)
             {
                 var cursor = CursorShape.Arrow;
                 var previewDragMode = GetDragModeFor(args.RelativePosition);
+                previewDragMode &= ~DragMode.Move;
+
                 switch (previewDragMode)
                 {
                     case DragMode.Top:
@@ -117,9 +119,6 @@ protected internal override void MouseMove(GUIMouseMoveEventArgs args)
 
                     case DragMode.Bottom | DragMode.Left:
                     case DragMode.Top | DragMode.Right:
-                        cursor = CursorShape.Crosshair;
-                        break;
-
                     case DragMode.Bottom | DragMode.Right:
                     case DragMode.Top | DragMode.Left:
                         cursor = CursorShape.Crosshair;
@@ -161,15 +160,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}");
-                */
             }
         }