Splash Form corrections

arkypita · Dec 22, 2016 · 05a0bb8 · 05a0bb8
1 parent 179a520
commit 05a0bb8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 33 deletions.
diff --git a/LaserGRBL/MainForm.Designer.cs b/LaserGRBL/MainForm.Designer.cs
diff --git a/LaserGRBL/MainForm.cs b/LaserGRBL/MainForm.cs
@@ -21,7 +21,8 @@ public MainForm()
 			InitializeComponent();
 
 			SplashScreenForm f = new SplashScreenForm();
-			f.Show();
+			f.ShowDialog();
+			f.Dispose();
 
 			//build main communication object
 			Core = new GrblCore(this);
@@ -48,6 +49,8 @@ private void MainForm_Load(object sender, EventArgs e)
 				ConnectionForm.Show(DockArea, LaserGRBL.UserControls.DockingManager.DockState.DockLeft);
 				JogForm.Show(ConnectionForm.Pane, LaserGRBL.UserControls.DockingManager.DockAlignment.Bottom, 0.2);
 			}
+
+			UpdateTimer.Enabled = true;
 		}
 
 		private LaserGRBL.UserControls.DockingManager.IDockContent GetContentFromPersistString(string persistString)

diff --git a/LaserGRBL/MainForm.resx b/LaserGRBL/MainForm.resx
@@ -124,6 +124,9 @@
     <value>295, 17</value>
   </metadata>
   <metadata name="MMn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>118, 17</value>
+  </metadata>
+  <metadata name="DockArea.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

diff --git a/LaserGRBL/SplashScreenForm.cs b/LaserGRBL/SplashScreenForm.cs
@@ -14,6 +14,7 @@ public partial class SplashScreenForm : Form
 		public SplashScreenForm()
 		{
 			InitializeComponent();
+			this.DoubleBuffered = true;
 		}
 
 		private void SplashScreenForm_Load(object sender, EventArgs e)
@@ -23,14 +24,19 @@ private void SplashScreenForm_Load(object sender, EventArgs e)
 
 		private void timer1_Tick(object sender, EventArgs e)
 		{
-			timer1.Enabled = false;
-			Close();
+			CloseAndGoMain();
 		}
 
 		private void pictureBox1_Click(object sender, EventArgs e)
+		{
+			CloseAndGoMain();
+		}
+
+		private void CloseAndGoMain()
 		{
 			timer1.Enabled = false;
 			Close();
+
 		}
 	}
 }