Bugfix/v3.17.x.x/1158 incorrect scrolling of window on multiple monitors, fixes debug menu and correct processing modified files during install diff (#165)

* Fix incorrect scrolling of window on multiple monitors (1158) and fixes debug menu

* fixed process modified files

* Update changelog and version

* Update version and changelog

* Update Version.cs

* Refactoring

* Update Version.cs

* Update CHANGELOG.md

Co-authored-by: Jakub Szczyrk <Jakub Szczyrk>
Co-authored-by: Tomasz Jaworski <[email protected]>

Author: Szczyrk

Assets/PatchKit Patcher/Scripts/Debug/DebugMenu.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Diagnostics;
 using System.IO;
+using PatchKit.Unity.Patcher.UI;
 using PatchKit.Unity.Utilities;
 using UnityEngine;
 using UnityEngine.UI;
@@ -18,17 +19,11 @@ public class DebugMenu : MonoBehaviour
         private string _popupMessage;
         private GraphicRaycaster _graphicRaycaster;
         private PlatformType _platformType;
+        private bool _wasInitialized;
+
 
         void Start()
         {
-            int windowWidth = 250;
-            int windowHeight = 180;
-            int x = (Screen.width - windowWidth) / 2;
-            int y = (Screen.height - windowHeight) / 2;
-            int popupRectY = (Screen.height - 120) / 2;
-            _rect = new Rect(x, y, windowWidth, windowHeight);
-            _popupRect = new Rect(x, popupRectY, windowWidth, 120);
-            _texturePopupRect = new Rect(0, popupRectY - y, windowWidth, 120);
             _graphicRaycaster = FindObjectOfType<GraphicRaycaster>();
             _platformType = Platform.GetPlatformType();
         }
@@ -50,6 +45,20 @@ void OnGUI()
 
             if (_show)
             {
+                if (!_wasInitialized)
+                {
+                    _wasInitialized = true;
+                    float scale = ScreenScale.Value;
+                    float windowWidth = 250 * scale;
+                    float windowHeight = 200 * scale;
+                    float x = (Screen.width - windowWidth) / 2;
+                    float y = (Screen.height - windowHeight) / 2;
+                    float popupRectY = (Screen.height - 120) / 2;
+                    _rect = new Rect(x, y, windowWidth, windowHeight);
+                    _popupRect = new Rect(x, popupRectY, windowWidth, 120);
+                    _texturePopupRect = new Rect(0, popupRectY - y, windowWidth, 120);
+                }
+
                 GUI.DrawTexture(_rect, Texture2D.whiteTexture);
                 GUI.Window(0, _rect, Draw, "Debug Menu");
                 if (_showPopup)
@@ -103,6 +112,11 @@ void Draw(int id)
                 }
             }
 
+            if (GUILayout.Button("Close"))
+            {
+                Close();
+            }
+
             if (_showPopup)
             {
                 GUI.DrawTexture(_texturePopupRect, Texture2D.whiteTexture);
@@ -269,6 +283,7 @@ void Open()
         {
             _show = true;
             _graphicRaycaster.enabled = false;
+            _wasInitialized = false;
         }
 
         private ProcessStartInfo GetProcessStartInfo(string executablePath)

Assets/PatchKit Patcher/Scripts/UI/BorderlessWindow.cs

@@ -126,28 +126,7 @@ private void Awake()
                 CanvasScaler = FindObjectOfType<CanvasScaler>();
             }
 
-            float screenScale;
-            float screenDpi = Screen.dpi;
-            if (screenDpi >= 400)
-            {
-                screenScale = 4;
-            }
-            else if (screenDpi >= 200)
-            {
-                screenScale = 2;
-            }
-            else
-            {
-                if (screenDpi == 0)
-                {
-                    _logger.LogWarning("Unable to determine the current DPI.");
-                }
-
-                screenScale = 1;
-            }
-
-            _logger.LogDebug(string.Format("Screen scale: {0}", screenScale));
-
+            float screenScale = ScreenScale.Value;
             EnforceCorrectScreenSize(screenScale);
 
 #if UNITY_STANDALONE_WIN && !UNITY_EDITOR
@@ -234,9 +213,6 @@ private void Update()
             screenMax.x -= Screen.width;
             screenMax.y -= Screen.height;
 
-            _windowRect.position = new Vector2(Mathf.Clamp(_windowRect.position.x, 0.0f, screenMax.x),
-                Mathf.Clamp(_windowRect.position.y, 0.0f, screenMax.y));
-
             int flags = (int) GetWindowLongPtr(_windowsHandle, GwlStyle);
 
             Flags.Unset(ref flags, WsCaption);

Assets/PatchKit Patcher/Scripts/UI/ScreenScale.cs

@@ -0,0 +1,41 @@
+using PatchKit.Unity.Patcher.Debug;
+using UnityEngine;
+
+namespace PatchKit.Unity.Patcher.UI
+{
+public class ScreenScale
+{
+    private static readonly DebugLogger DebugLogger = new DebugLogger(typeof(ScreenScale));
+
+    public static float Value
+    {
+        get
+        {
+            float screenScale;
+            float screenDpi = Screen.dpi;
+            if (screenDpi >= 400)
+            {
+                screenScale = 4;
+            }
+            else if (screenDpi >= 200)
+            {
+                screenScale = 2;
+            }
+            else
+            {
+                if (screenDpi == 0)
+                {
+                    DebugLogger.LogWarning("Unable to determine the current DPI.");
+                }
+
+                screenScale = 1;
+            }
+
+            DebugLogger.Log(string.Format("DPI: {0}", Screen.dpi));
+            DebugLogger.Log(string.Format("Screen scale: {0}", screenScale));
+
+            return screenScale;
+        }
+    }
+}
+}

Assets/PatchKit Patcher/Scripts/UI/ScreenScale.cs.meta

@@ -5,8 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [3.17.9.0]
+### Added
+- Support HDPI for debug menu
+
 ### Fixed
 - Wrong information about file size during installation
+- Broken borderless window position restrictions on multiple monitors (#1158)
 
 ## [3.17.8.0]
 ### Fixed