diff --git a/.vs/Catch the button/v16/.suo b/.vs/Catch the button/v16/.suo index 20c59e1..7b0edee 100644 Binary files a/.vs/Catch the button/v16/.suo and b/.vs/Catch the button/v16/.suo differ diff --git a/Catch the button/Main.Designer.cs b/Catch the button/Main.Designer.cs index 91f728e..26e6c7d 100644 --- a/Catch the button/Main.Designer.cs +++ b/Catch the button/Main.Designer.cs @@ -27,6 +27,7 @@ namespace Catch_the_button { this.Menu = new System.Windows.Forms.Panel(); this.button = new System.Windows.Forms.Label(); this.stats = new System.Windows.Forms.Panel(); + this.milestone = new System.Windows.Forms.Label(); this.timeleft = new System.Windows.Forms.Label(); this.hp = new System.Windows.Forms.Label(); this.ptsCount = new System.Windows.Forms.Label(); @@ -44,7 +45,6 @@ namespace Catch_the_button { this.label4 = new System.Windows.Forms.Label(); this.quit = new System.Windows.Forms.Button(); this.start = new System.Windows.Forms.Button(); - this.milestone = new System.Windows.Forms.Label(); this.Menu.SuspendLayout(); this.stats.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -87,7 +87,7 @@ namespace Catch_the_button { this.button.TabIndex = 6; this.button.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.button.Visible = false; - this.button.Click += new System.EventHandler(this.button_Click); + this.button.MouseDown += new System.Windows.Forms.MouseEventHandler(this.button_MouseDown); this.button.MouseEnter += new System.EventHandler(this.button_MouseEnter); this.button.MouseLeave += new System.EventHandler(this.button_MouseLeave); // @@ -103,6 +103,16 @@ namespace Catch_the_button { this.stats.Size = new System.Drawing.Size(955, 30); this.stats.TabIndex = 1002; // + // milestone + // + this.milestone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.milestone.AutoSize = true; + this.milestone.Location = new System.Drawing.Point(569, 6); + this.milestone.Name = "milestone"; + this.milestone.Size = new System.Drawing.Size(207, 19); + this.milestone.TabIndex = 1002; + this.milestone.Text = "Next Milestone in: ..."; + // // timeleft // this.timeleft.AutoSize = true; @@ -288,16 +298,6 @@ namespace Catch_the_button { this.start.UseVisualStyleBackColor = true; this.start.Click += new System.EventHandler(this.start_Click); // - // milestone - // - this.milestone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.milestone.AutoSize = true; - this.milestone.Location = new System.Drawing.Point(569, 6); - this.milestone.Name = "milestone"; - this.milestone.Size = new System.Drawing.Size(207, 19); - this.milestone.TabIndex = 1002; - this.milestone.Text = "Next Milestone in: ..."; - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); @@ -311,8 +311,8 @@ namespace Catch_the_button { this.Name = "Main"; this.Text = "Catch the Button 2"; this.Load += new System.EventHandler(this.Form1_Load); - this.Click += new System.EventHandler(this.Form1_Click); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Main_KeyDown); + this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Main_MouseDown); this.Menu.ResumeLayout(false); this.Menu.PerformLayout(); this.stats.ResumeLayout(false); diff --git a/Catch the button/Main.cs b/Catch the button/Main.cs index 3ab07d0..dc57275 100644 --- a/Catch the button/Main.cs +++ b/Catch the button/Main.cs @@ -29,15 +29,6 @@ namespace Catch_the_button { this.Close(); } - private void button_Click(object sender, EventArgs e) { - Game.Hit(); - } - - private void Form1_Click(object sender, EventArgs e) { - Game.Hit(obj: sender); - } - - private void button_MouseEnter(object sender, EventArgs e) { button.BackColor = Color.FromArgb(240, 240, 240); } @@ -55,5 +46,13 @@ namespace Catch_the_button { break; } } + + private void button_MouseDown(object sender, MouseEventArgs e) { + Game.Hit(); + } + + private void Main_MouseDown(object sender, MouseEventArgs e) { + Game.Hit(obj: sender); + } } } diff --git a/Catch the button/bin/Debug/Catch the button.exe b/Catch the button/bin/Debug/Catch the button.exe index 0859537..575574a 100644 Binary files a/Catch the button/bin/Debug/Catch the button.exe and b/Catch the button/bin/Debug/Catch the button.exe differ diff --git a/Catch the button/bin/Debug/Catch the button.pdb b/Catch the button/bin/Debug/Catch the button.pdb index 4ec9d6b..11b98c3 100644 Binary files a/Catch the button/bin/Debug/Catch the button.pdb and b/Catch the button/bin/Debug/Catch the button.pdb differ diff --git a/Catch the button/obj/Debug/Catch the button.csproj.FileListAbsolute.txt b/Catch the button/obj/Debug/Catch the button.csproj.FileListAbsolute.txt index b982d61..f367ba3 100644 --- a/Catch the button/obj/Debug/Catch the button.csproj.FileListAbsolute.txt +++ b/Catch the button/obj/Debug/Catch the button.csproj.FileListAbsolute.txt @@ -30,3 +30,14 @@ C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Debug\Ca C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.csproj.CoreCompileInputs.cache C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.exe C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.pdb +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\bin\Debug\Catch the button.exe.config +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\bin\Debug\Catch the button.exe +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\bin\Debug\Catch the button.pdb +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.csproj.AssemblyReference.cache +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch_the_button.Main.resources +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch_the_button.LeaderDialog.resources +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch_the_button.Properties.Resources.resources +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.csproj.GenerateResource.cache +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.csproj.CoreCompileInputs.cache +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.exe +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Debug\Catch the button.pdb diff --git a/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache b/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache index d1862d9..0d67bbf 100644 Binary files a/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache and b/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache differ diff --git a/Catch the button/obj/Debug/Catch the button.exe b/Catch the button/obj/Debug/Catch the button.exe index 0859537..575574a 100644 Binary files a/Catch the button/obj/Debug/Catch the button.exe and b/Catch the button/obj/Debug/Catch the button.exe differ diff --git a/Catch the button/obj/Debug/Catch the button.pdb b/Catch the button/obj/Debug/Catch the button.pdb index 4ec9d6b..11b98c3 100644 Binary files a/Catch the button/obj/Debug/Catch the button.pdb and b/Catch the button/obj/Debug/Catch the button.pdb differ diff --git a/Catch the button/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Catch the button/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d2b7260..476f246 100644 Binary files a/Catch the button/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Catch the button/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ