(e9f10995d) Merge branch 'bugreporterUI' into dev

2019-05-18 17:43:00 +03:00
parent 3a2310e547
commit 78b67de866
52 changed files with 428 additions and 223 deletions
@@ -36,6 +36,16 @@ namespace Barotrauma
            get { return (GameMain.GraphicsWidth / 1920.0f + GameMain.GraphicsHeight / 1080.0f) / 2.0f * GameSettings.HUDScale; }
        }

+        public static float xScale
+        {
+            get { return GameMain.GraphicsWidth / 1920.0f * GameSettings.HUDScale; }
+        }
+
+        public static float yScale
+        {
+            get { return GameMain.GraphicsHeight / 1080.0f * GameSettings.HUDScale; }
+        }
+
        public static GUIStyle Style;

        private static Texture2D t;
@@ -386,8 +396,11 @@ namespace Barotrauma
            {
                MouseOn.DrawToolTip(spriteBatch);
            }
-            
-            Cursor.Draw(spriteBatch, PlayerInput.LatestMousePosition);            
+
+            if (GameMain.WindowActive)
+            {
+                Cursor.Draw(spriteBatch, PlayerInput.LatestMousePosition, 0, Scale / 2f);
+            }
        }

        public static void DrawBackgroundSprite(SpriteBatch spriteBatch, Sprite backgroundSprite, float blurAmount = 1.0f, float aberrationStrength = 1.0f)