diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo index e691c40..6935351 100644 Binary files a/DamageCalculator/.vs/DamageCalculator/v17/.suo and b/DamageCalculator/.vs/DamageCalculator/v17/.suo differ diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml b/DamageCalculator/DamageCalculator/MainWindow.xaml index 73ac8fa..b7ae859 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml @@ -10,8 +10,8 @@ WindowStartupLocation="CenterScreen" Icon="27.ico" WindowState="Maximized" MouseMove="Window_MouseMove" - KeyDown="Window_KeyDown" - KeyUp="Window_KeyUp" + PreviewKeyDown="Window_PreviewKeyDown" + PreviewKeyUp="Window_PreviewKeyUp" PreviewMouseDown="Window_PreviewMouseDown"> diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index a702c02..cd29c82 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -1034,7 +1034,7 @@ namespace Damage_Calculator txtCursorX.Text = txtCursorY.Text = "0"; } } - private void Window_KeyDown(object sender, KeyEventArgs e) + private void Window_PreviewKeyDown(object sender, KeyEventArgs e) { if (e.Key == Key.C && Keyboard.Modifiers == ModifierKeys.Control) { @@ -1043,12 +1043,14 @@ namespace Damage_Calculator // Pass it on for spacebar pan start this.rightZoomBorder.KeyDown(sender, e); + e.Handled = true; } - private void Window_KeyUp(object sender, KeyEventArgs e) + private void Window_PreviewKeyUp(object sender, KeyEventArgs e) { // Pass it on for spacebar pan stop this.rightZoomBorder.KeyUp(sender, e); + e.Handled = true; } #endregion } diff --git a/DamageCalculator/DamageCalculator/ZoomBorder.cs b/DamageCalculator/DamageCalculator/ZoomBorder.cs index f8cadcd..79a5ab0 100644 --- a/DamageCalculator/DamageCalculator/ZoomBorder.cs +++ b/DamageCalculator/DamageCalculator/ZoomBorder.cs @@ -131,7 +131,6 @@ namespace Damage_Calculator var tt = GetTranslateTransform(child); start = e.GetPosition(this); origin = new Point(tt.X, tt.Y); - this.Cursor = Cursors.Hand; child.CaptureMouse(); } } @@ -139,10 +138,7 @@ namespace Damage_Calculator private void child_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) { if (child != null) - { child.ReleaseMouseCapture(); - this.Cursor = Cursors.Arrow; - } } private void child_MouseMove(object sender, MouseEventArgs e) diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe index 1a01cd9..d82f892 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 cfbefe6..234023a 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 10e0c58..0bb0458 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 157e586..c526a2d 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 1a01cd9..d82f892 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 cfbefe6..234023a 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/Debug/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs index 28cb244..797c8c6 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Debug/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/Debug/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs index 28cb244..797c8c6 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Debug/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 diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe index 10e0c58..0bb0458 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 157e586..c526a2d 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb differ