From 3189e7462ad0db9cffcf1bebe8f2e61559aab411 Mon Sep 17 00:00:00 2001 From: pointfeev Date: Fri, 30 Jul 2021 03:19:46 -0500 Subject: [PATCH] Fixed form StartPositions --- CreamInstaller/CreamInstaller.csproj | 2 +- CreamInstaller/DialogForm.Designer.cs | 2 +- CreamInstaller/DialogForm.cs | 3 ++- CreamInstaller/InstallForm.Designer.cs | 2 +- CreamInstaller/InstallForm.cs | 3 ++- CreamInstaller/MainForm.cs | 6 +++--- CreamInstaller/SelectForm.Designer.cs | 2 +- CreamInstaller/SelectForm.cs | 5 +++-- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CreamInstaller/CreamInstaller.csproj b/CreamInstaller/CreamInstaller.csproj index d119a03..9dd0282 100644 --- a/CreamInstaller/CreamInstaller.csproj +++ b/CreamInstaller/CreamInstaller.csproj @@ -6,7 +6,7 @@ true ini.ico true - 1.0.1 + 1.0.2 ini.ico Automatically downloads and installs CreamAPI files for programs/games. diff --git a/CreamInstaller/DialogForm.Designer.cs b/CreamInstaller/DialogForm.Designer.cs index 3bed4e6..4417ad4 100644 --- a/CreamInstaller/DialogForm.Designer.cs +++ b/CreamInstaller/DialogForm.Designer.cs @@ -131,7 +131,7 @@ namespace CreamInstaller this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "DialogForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "DialogForm"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.icon)).EndInit(); diff --git a/CreamInstaller/DialogForm.cs b/CreamInstaller/DialogForm.cs index ed0224b..b280e6e 100644 --- a/CreamInstaller/DialogForm.cs +++ b/CreamInstaller/DialogForm.cs @@ -6,8 +6,9 @@ namespace CreamInstaller { public partial class DialogForm : Form { - public DialogForm() + public DialogForm(IWin32Window owner) { + Owner = owner as Form; InitializeComponent(); } diff --git a/CreamInstaller/InstallForm.Designer.cs b/CreamInstaller/InstallForm.Designer.cs index 295181d..e440267 100644 --- a/CreamInstaller/InstallForm.Designer.cs +++ b/CreamInstaller/InstallForm.Designer.cs @@ -126,7 +126,7 @@ namespace CreamInstaller this.MinimumSize = new System.Drawing.Size(500, 300); this.Name = "InstallForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "InstallForm"; this.TopMost = true; this.Load += new System.EventHandler(this.OnLoad); diff --git a/CreamInstaller/InstallForm.cs b/CreamInstaller/InstallForm.cs index 8c64125..1ef7da0 100644 --- a/CreamInstaller/InstallForm.cs +++ b/CreamInstaller/InstallForm.cs @@ -11,8 +11,9 @@ namespace CreamInstaller { public partial class InstallForm : Form { - public InstallForm() + public InstallForm(IWin32Window owner) { + Owner = owner as Form; InitializeComponent(); Program.InstallForm = this; Text = Program.ApplicationName; diff --git a/CreamInstaller/MainForm.cs b/CreamInstaller/MainForm.cs index ce128df..4d051a0 100644 --- a/CreamInstaller/MainForm.cs +++ b/CreamInstaller/MainForm.cs @@ -32,7 +32,7 @@ namespace CreamInstaller } Hide(); - new SelectForm().ShowDialog(); + new SelectForm(this).ShowDialog(); Close(); } @@ -86,7 +86,7 @@ namespace CreamInstaller string FileName = Path.GetFileName(Program.CurrentProcessFilePath); if (FileName != "CreamInstaller.exe") { - if (new DialogForm().Show(Program.ApplicationName, SystemIcons.Warning, + if (new DialogForm(this).Show(Program.ApplicationName, SystemIcons.Warning, "WARNING: CreamInstaller.exe was renamed!" + "\n\nThis will cause unwanted behavior when updating the program!", "Ignore", "Abort") == DialogResult.Cancel) @@ -104,7 +104,7 @@ namespace CreamInstaller } catch (ApiException) { - if (new DialogForm().Show(Program.ApplicationName, SystemIcons.Warning, + if (new DialogForm(this).Show(Program.ApplicationName, SystemIcons.Warning, $"ERROR: Failed logging into MEGA!" + "\n\nMEGA is likely offline, please try again later. . .", "Retry", "Cancel") == DialogResult.OK) diff --git a/CreamInstaller/SelectForm.Designer.cs b/CreamInstaller/SelectForm.Designer.cs index 36e59ce..5a23442 100644 --- a/CreamInstaller/SelectForm.Designer.cs +++ b/CreamInstaller/SelectForm.Designer.cs @@ -149,7 +149,7 @@ namespace CreamInstaller this.MinimumSize = new System.Drawing.Size(500, 328); this.Name = "SelectForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "SelectForm"; this.TopMost = true; this.Load += new System.EventHandler(this.OnLoad); diff --git a/CreamInstaller/SelectForm.cs b/CreamInstaller/SelectForm.cs index 3337f27..db8d727 100644 --- a/CreamInstaller/SelectForm.cs +++ b/CreamInstaller/SelectForm.cs @@ -13,8 +13,9 @@ namespace CreamInstaller { public partial class SelectForm : Form { - public SelectForm() + public SelectForm(IWin32Window owner) { + Owner = owner as Form; InitializeComponent(); Program.SelectForm = this; Text = Program.ApplicationName; @@ -222,7 +223,7 @@ namespace CreamInstaller if (Program.ProgramSelections.Count > 0) { Hide(); - new InstallForm().ShowDialog(); + new InstallForm(this).ShowDialog(); Close(); } }