From f13bd3f5637df81f6800356c72230e84202cfe92 Mon Sep 17 00:00:00 2001 From: craftxbox Date: Thu, 23 Feb 2017 19:01:25 -0330 Subject: [PATCH 1/2] FIX THE OTHER DAMN ISSUE FOR THE THIRD TIME --- .../Applications/Pong.Designer.cs | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/ShiftOS.WinForms/Applications/Pong.Designer.cs b/ShiftOS.WinForms/Applications/Pong.Designer.cs index 16ae4e0..577d0db 100644 --- a/ShiftOS.WinForms/Applications/Pong.Designer.cs +++ b/ShiftOS.WinForms/Applications/Pong.Designer.cs @@ -1,3 +1,21 @@ +Skip to content +This repository +Search +Pull requests +Issues +Gist + @craftxbox + Sign out + Watch 5 + Star 6 + Fork 9 shiftos-game/ShiftOS + Code Issues 7 Pull requests 0 Projects 0 Wiki Pulse Graphs +Branch: master Find file Copy pathShiftOS/ShiftOS.WinForms/Applications/Pong.Designer.cs +6f939e2 12 days ago + Michael Fix Pong UI and panel buttons +0 contributors +RawBlameHistory +718 lines (713 sloc) 39.2 KB /* * MIT License * @@ -553,7 +571,11 @@ namespace ShiftOS.WinForms.Applications this.paddleHuman.BackColor = System.Drawing.Color.Black; this.paddleHuman.Location = new System.Drawing.Point(10, 134); this.paddleHuman.Name = "paddleHuman"; - this.paddleHuman.Size = new System.Drawing.Size(20, 100); + if(ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")){ + this.paddleHuman.Size = new System.Drawing.Size(20, 150); + } else { + this.paddleHuman.Size = new System.Drawing.Size(20, 100); + } this.paddleHuman.TabIndex = 3; this.paddleHuman.TabStop = false; // @@ -564,7 +586,11 @@ namespace ShiftOS.WinForms.Applications this.paddleComputer.Location = new System.Drawing.Point(666, 134); this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 100); this.paddleComputer.Name = "paddleComputer"; - this.paddleComputer.Size = new System.Drawing.Size(20, 100); + if(ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")){ + this.paddleComputer.Size = new System.Drawing.Size(20, 150); + } else { + this.paddleComputer.Size = new System.Drawing.Size(20, 100); + } this.paddleComputer.TabIndex = 1; // // lbllevelandtime @@ -715,4 +741,4 @@ namespace ShiftOS.WinForms.Applications private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.Button button2; } -} \ No newline at end of file +} From bd051072ff58f76983741b24d752945439937c26 Mon Sep 17 00:00:00 2001 From: craftxbox Date: Thu, 23 Feb 2017 19:07:21 -0330 Subject: [PATCH 2/2] NOT BE AN IDIOT --- .../Applications/Pong.Designer.cs | 47 +++++++------------ 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/ShiftOS.WinForms/Applications/Pong.Designer.cs b/ShiftOS.WinForms/Applications/Pong.Designer.cs index 577d0db..38cb63b 100644 --- a/ShiftOS.WinForms/Applications/Pong.Designer.cs +++ b/ShiftOS.WinForms/Applications/Pong.Designer.cs @@ -1,21 +1,4 @@ -Skip to content -This repository -Search -Pull requests -Issues -Gist - @craftxbox - Sign out - Watch 5 - Star 6 - Fork 9 shiftos-game/ShiftOS - Code Issues 7 Pull requests 0 Projects 0 Wiki Pulse Graphs -Branch: master Find file Copy pathShiftOS/ShiftOS.WinForms/Applications/Pong.Designer.cs -6f939e2 12 days ago - Michael Fix Pong UI and panel buttons -0 contributors -RawBlameHistory -718 lines (713 sloc) 39.2 KB + /* * MIT License * @@ -571,11 +554,14 @@ namespace ShiftOS.WinForms.Applications this.paddleHuman.BackColor = System.Drawing.Color.Black; this.paddleHuman.Location = new System.Drawing.Point(10, 134); this.paddleHuman.Name = "paddleHuman"; - if(ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")){ - this.paddleHuman.Size = new System.Drawing.Size(20, 150); - } else { - this.paddleHuman.Size = new System.Drawing.Size(20, 100); - } + if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) + { + this.paddleHuman.Size = new System.Drawing.Size(20, 150); + } + else + { + this.paddleHuman.Size = new System.Drawing.Size(20, 100); + } this.paddleHuman.TabIndex = 3; this.paddleHuman.TabStop = false; // @@ -586,11 +572,14 @@ namespace ShiftOS.WinForms.Applications this.paddleComputer.Location = new System.Drawing.Point(666, 134); this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 100); this.paddleComputer.Name = "paddleComputer"; - if(ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")){ - this.paddleComputer.Size = new System.Drawing.Size(20, 150); - } else { - this.paddleComputer.Size = new System.Drawing.Size(20, 100); - } + if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) + { + this.paddleComputer.Size = new System.Drawing.Size(20, 150); + } + else + { + this.paddleComputer.Size = new System.Drawing.Size(20, 100); + } this.paddleComputer.TabIndex = 1; // // lbllevelandtime @@ -606,7 +595,7 @@ namespace ShiftOS.WinForms.Applications // // lblstatscodepoints // - this.lblstatscodepoints.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.lblstatscodepoints.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblstatscodepoints.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblstatscodepoints.Location = new System.Drawing.Point(239, 356);