aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-11 13:32:26 -0500
committerMichael <[email protected]>2017-02-11 13:32:26 -0500
commit6f939e295e5d2e6ee5b3dad093d2d8c569a30087 (patch)
tree60a7d27b1e5ea24d2e6b37f9e5475634c5eb90bc
parentd90ea0ba0126f0a4bee6fd200e1fb5219ad884dc (diff)
downloadshiftos_thereturn-6f939e295e5d2e6ee5b3dad093d2d8c569a30087.tar.gz
shiftos_thereturn-6f939e295e5d2e6ee5b3dad093d2d8c569a30087.tar.bz2
shiftos_thereturn-6f939e295e5d2e6ee5b3dad093d2d8c569a30087.zip
Fix Pong UI and panel buttons
-rw-r--r--ShiftOS.WinForms/Applications/Pong.Designer.cs26
-rw-r--r--ShiftOS.WinForms/Applications/Pong.cs5
-rw-r--r--ShiftOS.WinForms/WinformsDesktop.cs4
3 files changed, 14 insertions, 21 deletions
diff --git a/ShiftOS.WinForms/Applications/Pong.Designer.cs b/ShiftOS.WinForms/Applications/Pong.Designer.cs
index 3febf91..16ae4e0 100644
--- a/ShiftOS.WinForms/Applications/Pong.Designer.cs
+++ b/ShiftOS.WinForms/Applications/Pong.Designer.cs
@@ -435,25 +435,13 @@ namespace ShiftOS.WinForms.Applications
//
// lblbutyougained
//
- if (ShiftoriumFrontend.UpgradeInstalled("pong_upgrade_2"))
- {
- this.lblbutyougained.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblbutyougained.Location = new System.Drawing.Point(3, 125);
- this.lblbutyougained.Name = "lblbutyougained";
- this.lblbutyougained.Size = new System.Drawing.Size(146, 35);
- this.lblbutyougained.TabIndex = 3;
- this.lblbutyougained.Text = "But you gained 5 Codepoints";
- this.lblbutyougained.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- } else
- {
- this.lblbutyougained.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblbutyougained.Location = new System.Drawing.Point(3, 125);
- this.lblbutyougained.Name = "lblbutyougained";
- this.lblbutyougained.Size = new System.Drawing.Size(0, 0);
- this.lblbutyougained.TabIndex = 3;
- this.lblbutyougained.Text = "But you gained 5 Codepoints";
- this.lblbutyougained.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- }
+ this.lblbutyougained.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblbutyougained.Location = new System.Drawing.Point(3, 125);
+ this.lblbutyougained.Name = "lblbutyougained";
+ this.lblbutyougained.Size = new System.Drawing.Size(146, 35);
+ this.lblbutyougained.TabIndex = 3;
+ this.lblbutyougained.Text = "But you gained 5 Codepoints";
+ this.lblbutyougained.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// btnlosetryagain
//
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index d61e1fd..4b531b3 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -633,6 +633,11 @@ namespace ShiftOS.WinForms.Applications
public void OnLoad()
{
+ pnlintro.BringToFront();
+ pnlintro.Show();
+ pnlhighscore.Hide();
+ pnlgamestats.Hide();
+ pnlfinalstats.Hide();
}
public void OnSkinLoad()
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index c940eae..d813e51 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -172,7 +172,6 @@ namespace ShiftOS.WinForms
pnlbtntext.AutoSize = true;
pnlbtntext.Location = LoadedSkin.PanelButtonFromLeft;
pnlbtntext.ForeColor = LoadedSkin.PanelButtonTextColor;
- pnlbtntext.Font = LoadedSkin.PanelButtonFont;
pnlbtntext.BackColor = Color.Transparent;
pnlbtn.BackColor = LoadedSkin.PanelButtonColor;
@@ -193,7 +192,8 @@ namespace ShiftOS.WinForms
pnlbtn.Click += onClick;
pnlbtntext.Click += onClick;
}
- SetCursors(pnlbtn);
+ pnlbtntext.Font = LoadedSkin.PanelButtonFont;
+
}
}
}