Fixed forms opening in random spots.

GittyMac · Dec 4, 2021 · c53ed9d · c53ed9d
1 parent 376ecd5
commit c53ed9d
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 48 deletions.
diff --git a/FunkeySelector/CustomFManager.cs b/FunkeySelector/CustomFManager.cs
@@ -25,15 +25,5 @@ class CustomFManager
             }
             //It saves a lot of time to have a simple function to call rather than individual statements.
         }
-
-        public void changeToNoHub() //This will change the main.swf to the No Hub mod.
-        {
-
-        }
-
-        public void changeToHub() //This will change the main.swf to the default Hub mode.
-        {
-
-        }
     }
 }
diff --git a/FunkeySelector/Form1.cs b/FunkeySelector/Form1.cs
@@ -132,15 +132,17 @@ private void button1_Click_1(object sender, EventArgs e)
         {
             Form2 funktown = new Form2();
             this.Hide();
-            funktown.Show();
+            funktown.StartPosition = FormStartPosition.CenterParent;
+            funktown.ShowDialog(this);
         }
 
         //Kelpy Basin
         private void button2_Click(object sender, EventArgs e)
         {
             Form3 kelp = new Form3();
             this.Hide();
-            kelp.Show();
+            kelp.StartPosition = FormStartPosition.CenterParent;
+            kelp.ShowDialog(this);
         }
 
         //Exit (Again)
@@ -154,23 +156,26 @@ private void button3_Click(object sender, EventArgs e)
         {
             Form4 magma = new Form4();
             this.Hide();
-            magma.Show();
+            magma.StartPosition = FormStartPosition.CenterParent;
+            magma.ShowDialog(this);
         }
 
         //Laputta Station
         private void button4_Click(object sender, EventArgs e)
         {
             Form5 laput = new Form5();
             this.Hide();
-            laput.Show();
+            laput.StartPosition = FormStartPosition.CenterParent;
+            laput.ShowDialog(this);
         }
 
         //Funkiki Island
         private void button5_Click(object sender, EventArgs e)
         {
             Form6 funkiki = new Form6();
             this.Hide();
-            funkiki.Show();
+            funkiki.StartPosition = FormStartPosition.CenterParent;
+            funkiki.Show(this);
         }
 
 
@@ -179,39 +184,44 @@ private void button6_Click(object sender, EventArgs e)
         {
             Form7 rrc = new Form7();
             this.Hide();
-            rrc.Show();
+            rrc.StartPosition = FormStartPosition.CenterParent;
+            rrc.ShowDialog(this);
         }
 
         //Nightmare Rift
         private void button7_Click(object sender, EventArgs e)
         {
             Form8 nightmare = new Form8();
             this.Hide();
-            nightmare.Show();
+            nightmare.StartPosition = FormStartPosition.CenterParent;
+            nightmare.ShowDialog(this);
         }
 
         //Daydream Oasis
         private void button8_Click(object sender, EventArgs e)
         {
             Form9 daydream = new Form9();
             this.Hide();
-            daydream.Show();
+            daydream.StartPosition = FormStartPosition.CenterParent;
+            daydream.ShowDialog(this);
         }
 
         //Hidden Realm
         private void button9_Click(object sender, EventArgs e)
         {
             Form10 hrf = new Form10();
             this.Hide();
-            hrf.Show();
+            hrf.StartPosition = FormStartPosition.CenterParent;
+            hrf.ShowDialog(this);
         }
 
         //Paradox Green
         private void button10_Click(object sender, EventArgs e)
         {
             Form11 paradox = new Form11();
             this.Hide();
-            paradox.Show();
+            paradox.StartPosition = FormStartPosition.CenterParent;
+            paradox.ShowDialog(this);
         }
 
         //U.B.
@@ -225,7 +235,8 @@ private void Button13_Click(object sender, EventArgs e)
         {
             Form12 unused = new Form12();
             this.Hide();
-            unused.Show();
+            unused.StartPosition = FormStartPosition.CenterParent;
+            unused.ShowDialog(this);
         }
 
         //Insert Custom ID
@@ -239,7 +250,8 @@ private void button16_Click(object sender, EventArgs e)
         {
             Form13 customf = new Form13();
             this.Hide();
-            customf.Show();
+            customf.StartPosition = FormStartPosition.CenterParent;
+            customf.ShowDialog(this);
         }
 
         //Options

diff --git a/FunkeySelector/Form10.cs b/FunkeySelector/Form10.cs
@@ -51,8 +51,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Singe

diff --git a/FunkeySelector/Form11.cs b/FunkeySelector/Form11.cs
@@ -51,8 +51,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Rastro

diff --git a/FunkeySelector/Form12.cs b/FunkeySelector/Form12.cs
@@ -104,8 +104,9 @@ private void Button9_Click(object sender, EventArgs e)
         private void Button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Close

diff --git a/FunkeySelector/Form13.cs b/FunkeySelector/Form13.cs
@@ -67,8 +67,9 @@ private void button2_Click(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Will select Funkey when listbox item is selected.

diff --git a/FunkeySelector/Form2.cs b/FunkeySelector/Form2.cs
@@ -52,8 +52,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Scratch

diff --git a/FunkeySelector/Form3.cs b/FunkeySelector/Form3.cs
@@ -53,8 +53,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Glub

diff --git a/FunkeySelector/Form4.cs b/FunkeySelector/Form4.cs
@@ -123,8 +123,9 @@ private void button11_Click(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Close

diff --git a/FunkeySelector/Form5.cs b/FunkeySelector/Form5.cs
@@ -128,8 +128,9 @@ private void button14_Click(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Close

diff --git a/FunkeySelector/Form6.cs b/FunkeySelector/Form6.cs
@@ -51,8 +51,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Flurry

diff --git a/FunkeySelector/Form7.cs b/FunkeySelector/Form7.cs
@@ -51,8 +51,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Racer X

diff --git a/FunkeySelector/Form8.cs b/FunkeySelector/Form8.cs
@@ -51,8 +51,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Ptep

diff --git a/FunkeySelector/Form9.cs b/FunkeySelector/Form9.cs
@@ -51,8 +51,9 @@ protected override void WndProc(ref Message m) //Allows the window to be dragged
         private void button1_Click(object sender, EventArgs e)
         {
             Form1 form1 = new Form1();
-            this.Close();
-            form1.Show();
+            this.Hide();
+            form1.StartPosition = FormStartPosition.CenterParent;
+            form1.ShowDialog(this);
         }
 
         //Dyer

diff --git a/FunkeySelector/Properties/AssemblyInfo.cs b/FunkeySelector/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]