Merge branch 'master' of https://github.com/henkmollema/Driftr.git

henkmollema · Oct 29, 2014 · 4cc1a1d · 4cc1a1d
2 parents a3f90fe + 25b4f76
commit 4cc1a1d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 33 deletions.
diff --git a/src/Driftr/DriftR.Designer.cs b/src/Driftr/DriftR.Designer.cs
diff --git a/src/Driftr/Driftr.cs b/src/Driftr/Driftr.cs
@@ -74,8 +74,10 @@ public Driftr()
             Init(screen.Size);
             pictureBox1.Parent = screen;
             pictureBox2.Parent = screen;
-            //lapTimeRedLabel.Parent = screen;
-            //lapTimeYellowLabel.Parent = screen;
+            lapTimeRedLabel.BackColor = Color.FromArgb(31, 161, 1);
+            lapTimeYellowLabel.BackColor = Color.FromArgb(31, 161, 1);
+            lapTimeRedLabel2.BackColor = Color.FromArgb(31, 161, 1);
+            lapTimeYellowLabel2.BackColor = Color.FromArgb(31, 161, 1);
 
             // brandstof
             InitTimer();
@@ -143,16 +145,16 @@ private void DrawScreen()
 
             roundsLabelYellow.Text = lapsYellow.ToString();
             roundsLabelRed.Text = lapsRed.ToString();
-            label1.Text = "";
-            label2.Text = "";
+            lapTimeRedLabel2.Text = "";
+            lapTimeYellowLabel2.Text = "";
 
             foreach (var x in _vehicleLapTimes[_vehicles[0]])
             {
-                label1.Text += x.ToString("mm':'ss':'ff") + Environment.NewLine;
+                lapTimeRedLabel2.Text += x.ToString("mm':'ss':'ff") + Environment.NewLine;
             }
             foreach (var x in _vehicleLapTimes[_vehicles[1]])
             {
-                label2.Text += x.ToString("mm':'ss':'ff") + Environment.NewLine;
+                lapTimeYellowLabel2.Text += x.ToString("mm':'ss':'ff") + Environment.NewLine;
             }
         }