Merge branch 'master' into master

SplitScreen-Me · Apr 25, 2022 · 54d6c45 · 54d6c45
2 parents 8ec6a4e + 5f9b38b
commit 54d6c45
Show file tree

Hide file tree

Showing 222 changed files with 15,691 additions and 3,965 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://www.paypal.com/donate/?hosted_button_id=P3NVBYRQ4Z45L
diff --git a/Master/NucleusCoopTool/Controls/GameNameControl.cs b/Master/NucleusCoopTool/Controls/GameNameControl.cs
diff --git a/Master/NucleusCoopTool/Controls/GameNameControl.resx b/Master/NucleusCoopTool/Controls/GameNameControl.resx
diff --git a/Master/NucleusCoopTool/Forms/BaseForm.cs b/Master/NucleusCoopTool/Forms/BaseForm.cs
@@ -17,8 +17,6 @@ public class BaseForm : Form, IDynamicSized
         public readonly IniFile ini = new IniFile(Path.Combine(Directory.GetCurrentDirectory(), "Settings.ini"));
         public BaseForm()
         {        
-            //SystemEvents.DisplaySettingsChanged += new EventHandler(SystemEvents_DisplaySettingsChanged); 
-
             Name = "BaseForm";
             Text = "BaseForm";
             // Default DPI = 96 = 100%
@@ -27,34 +25,22 @@ public BaseForm()
             // 12 * 300% = 36
             // 12 * 125% = 15
             // 12 * 150% = 18
-            //AutoScaleMode = AutoScaleMode.Font;
-
-            // BackColor = Color.FromArgb(50, 50, 50);
-            // ForeColor = Color.White;
-            //  Margin = new Padding(4, 4, 4, 4);
-
-
-            // create it here, else the desgienr will show the default windows font
-            //Font = new Font("Segoe UI", 9, GraphicsUnit.Point);
-            Font = new Font("Franklin Gothic Medium",9.75f, GraphicsUnit.Point);
-
+
             DPIManager.Register(this);
         }
 
-
-
         ~BaseForm()
         {       
-           //DPIManager.Unregister(this);
+           DPIManager.Unregister(this);
         }
 
-        //private void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
-        //{
-        //    DPIManager.ForceUpdate();
-        //}
-
         public void UpdateSize(float scale)
         {
+            if (IsDisposed)
+            {
+                DPIManager.Unregister(this);
+                return;
+            }
         }
 
         /// <summary>
@@ -77,5 +63,20 @@ public void SetUpForm(System.Windows.Forms.Form f)
             Point desktop = this.DesktopLocation;
             f.SetDesktopLocation(desktop.X + 100, desktop.Y + 100);
         }
+
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseForm));
+            this.SuspendLayout();
+            // 
+            // BaseForm
+            // 
+            this.ClientSize = new System.Drawing.Size(284, 261);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "BaseForm";
+            this.Text = "Nucleus Co-op";
+            this.ResumeLayout(false);
+
+        }
     }
 }