Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

2022-09-29 12:13:55 -03:00
parent 2d5cff1752 9ae6e35760
commit 77c63541eb
602 changed files with 19759 additions and 16312 deletions
@@ -412,7 +412,8 @@ namespace Barotrauma
                return;
            }

-            if (MouseRect.Contains(PlayerInput.MousePosition) && (GUI.MouseOn == null || (!(GUI.MouseOn is GUIButton) && GUI.IsMouseOn(this))))
+            bool isMouseOn = MouseRect.Contains(PlayerInput.MousePosition) && (GUI.MouseOn == null || (!(GUI.MouseOn is GUIButton) && GUI.IsMouseOn(this)));
+            if (isMouseOn || isSelecting)
            {
                State = ComponentState.Hover;
                if (PlayerInput.PrimaryMouseButtonDown())
@@ -448,10 +449,6 @@ namespace Barotrauma
                isSelecting = false;
                State = ComponentState.None;
            }
-            if (!isSelecting)
-            {
-                isSelecting = PlayerInput.IsShiftDown();
-            }

            if (mouseHeldInside && !PlayerInput.PrimaryMouseButtonHeld())
            {