Update EnableResize and GraphicsSettings

Author: SpockBauru

EnableResizeIL2CPP_netFm/EnableResize.cs

@@ -51,7 +51,7 @@ public class EnableResizeComponent : MonoBehaviour
         public EnableResizeComponent(IntPtr handle) : base(handle) { }
 
 
-        //Old code from mono version starts here
+        //MonoBehaviour code starts here
         public delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
 
         [DllImport("user32.dll")]
@@ -84,12 +84,10 @@ public EnableResizeComponent(IntPtr handle) : base(handle) { }
 
         private int windowStyle = 0;
         private bool fullScreen = false;
-        private bool prevFullScreen = true;
-        private int resolutionCheck = 0;
-        private int prevResolutionCheck = 1;
         private int borderlessStyle = 1;
-        private int prevBorderlessStyle = 0;
-        private int borderlessMask = WS_CAPTION | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SYSMENU | WS_THICKFRAME;
+        private const int borderlessMask = WS_CAPTION | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SYSMENU | WS_THICKFRAME;
+        private int resizableStyle = 1;
+        private const int resizableMask = WS_THICKFRAME | WS_MAXIMIZEBOX;
 
         private WaitForSecondsRealtime oneSecond = new WaitForSecondsRealtime(1f);
         private bool isInitialized = false;
@@ -124,9 +122,7 @@ private void Initialize()
             }, IntPtr.Zero);
 
             if (WindowHandle == IntPtr.Zero) return;
-
             isInitialized = true;
-
             StartCoroutine(TestScreen().WrapToIl2Cpp());
         }
 
@@ -137,22 +133,21 @@ private IEnumerator TestScreen()
                 if (!EnableResize.ConfigEnableResize.Value) yield break;
 
                 fullScreen = Screen.fullScreen;
-                resolutionCheck = Screen.width + Screen.height;
                 windowStyle = GetWindowLong(WindowHandle, GWL_STYLE);
 
                 // If zero, is in borderless mode
                 borderlessStyle = windowStyle & borderlessMask;
 
-                if (!fullScreen && prevFullScreen ||
-                    resolutionCheck != prevResolutionCheck ||
-                    borderlessStyle != 0 && prevBorderlessStyle == 0)
+                // if zero, is not resizable
+                resizableStyle = windowStyle & resizableMask;
+
+                if (resizableStyle  == 0 &&
+                    borderlessStyle != 0 &&
+                    fullScreen      == false)
                 {
                     ResizeWindow();
                 }
 
-                prevBorderlessStyle = borderlessStyle;
-                prevFullScreen = fullScreen;
-                prevResolutionCheck = resolutionCheck;
                 yield return oneSecond;
             }
         }

GraphicsSettingsIL2CPP_netFm/GraphicsSettings.cs

@@ -23,16 +23,16 @@ public class GraphicsSettings : BasePlugin
         private static ConfigEntry<int> Framerate;
         private static ConfigEntry<vSyncList> vSync;
 
-        private static ConfigEntry<bool> Apply;
+        private static ConfigEntry<bool> AutoApply;
 
         public override void Load()
         {
-            Apply = Config.Bind("Apply Settings", "Apply All Graphics Settings Bellow", false, "If disabled, settings will not be applied even when clicking on \"Save Preferences\" button");
-            Apply.SettingChanged += (sender, args) => ApplySettings();
+            AutoApply = Config.Bind("Apply on Startup", "Apply on Startup", false, "Apply graphics settings when you start the game. May also force the resolution when the game is running");
+            AutoApply.SettingChanged += (sender, args) => ApplySettings();
 
-            Width = Config.Bind("Resolution", "Width", 1280);
+            Width = Config.Bind("Resolution", "Width", 1280, "Set Resolution Width. Minimum is 800");
             Width.SettingChanged += (sender, args) => ApplySettings();
-            Height = Config.Bind("Resolution", "Height", 720);
+            Height = Config.Bind("Resolution", "Height", 720, "Set Resolution Height. Minimum is 600");
             Height.SettingChanged += (sender, args) => ApplySettings();
             DisplayMode = Config.Bind("Resolution", "Display Mode", DisplayModeList.Windowed);
             DisplayMode.SettingChanged += (sender, args) => ApplySettings();
@@ -42,7 +42,10 @@ public override void Load()
             Framerate = Config.Bind("Framerate", "Target Framerate", -1, "Target Framerate only works if vSync is Off. Set -1 to unlimited");
             Framerate.SettingChanged += (sender, args) => ApplySettings();
 
-            SceneManager.add_sceneLoaded(new Action<Scene, LoadSceneMode>((s, lsm) => GetResolution()));
+            SceneManager.add_sceneLoaded(new Action<Scene, LoadSceneMode>((s, lsm) => 
+            { 
+                if (AutoApply.Value) ApplySettings(); 
+            }));
         }
 
         private enum DisplayModeList
@@ -59,18 +62,11 @@ private enum vSyncList
             Half = 2
         }
 
-        private void GetResolution()
-        {
-            Apply.Value = false;
-            Width.Value = Screen.width;
-            Height.Value = Screen.height;
-            if (Screen.fullScreen) DisplayMode.Value = DisplayModeList.FullScreen;
-            if (!Screen.fullScreen) DisplayMode.Value = DisplayModeList.Windowed;
-        }
-
         private void ApplySettings()
         {
-            if (!Apply.Value) return;
+            if (Width.Value < 800) Width.Value = 800;
+            if (Height.Value < 600) Height.Value = 600;
+
             if (DisplayMode.Value == DisplayModeList.FullScreen)
                 Screen.SetResolution(Width.Value, Height.Value, FullScreenMode.ExclusiveFullScreen);
 

GraphicsSettingsIL2CPP_netFm/GraphicsSettingsIL2CPP_netFm.csproj

@@ -55,8 +55,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)bin\BepInEx\Plugins\" /s /i /y
-
-</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)bin\BepInEx\Plugins\" /s /i /y</PostBuildEvent>
   </PropertyGroup>
 </Project>