diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo index 6935351..c0de3aa 100644 Binary files a/DamageCalculator/.vs/DamageCalculator/v17/.suo and b/DamageCalculator/.vs/DamageCalculator/v17/.suo differ diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index cd29c82..35b7809 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -1043,14 +1043,20 @@ namespace Damage_Calculator // Pass it on for spacebar pan start this.rightZoomBorder.KeyDown(sender, e); - e.Handled = true; + + if(e.Key == Key.Space) + // We want space for us alone, so give no child element a piece of dat cake + e.Handled = true; } private void Window_PreviewKeyUp(object sender, KeyEventArgs e) { // Pass it on for spacebar pan stop this.rightZoomBorder.KeyUp(sender, e); - e.Handled = true; + + if (e.Key == Key.Space) + // We want space for us alone, so give no child element a piece of dat cake + e.Handled = true; } #endregion } diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe index d82f892..e99a621 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb index 234023a..f30a2cc 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe index 0bb0458..f95a89b 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb index c526a2d..2da0a3b 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe index d82f892..e99a621 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb index 234023a..f30a2cc 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe index 0bb0458..f95a89b 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb index c526a2d..2da0a3b 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs index 28cb244..797c8c6 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "520310F22F68AE4E47B66F6D92CC98AD8018EE1647882A1C45F9B52AC540A4BB" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "27FCD8BFBBC438E9A51021C3BEB68479D527817CDA486F3B2805D4C67A922CFB" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -422,13 +422,13 @@ namespace Damage_Calculator { #line hidden #line 13 "..\..\MainWindow.xaml" - ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + ((Damage_Calculator.MainWindow)(target)).PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyDown); #line default #line hidden #line 14 "..\..\MainWindow.xaml" - ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + ((Damage_Calculator.MainWindow)(target)).PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyUp); #line default #line hidden diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs index 28cb244..797c8c6 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "520310F22F68AE4E47B66F6D92CC98AD8018EE1647882A1C45F9B52AC540A4BB" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "27FCD8BFBBC438E9A51021C3BEB68479D527817CDA486F3B2805D4C67A922CFB" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -422,13 +422,13 @@ namespace Damage_Calculator { #line hidden #line 13 "..\..\MainWindow.xaml" - ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + ((Damage_Calculator.MainWindow)(target)).PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyDown); #line default #line hidden #line 14 "..\..\MainWindow.xaml" - ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + ((Damage_Calculator.MainWindow)(target)).PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyUp); #line default #line hidden