diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo index f9108f8..a310025 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 07fd78c..73ac8fa 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml @@ -11,7 +11,8 @@ WindowState="Maximized" MouseMove="Window_MouseMove" KeyDown="Window_KeyDown" - KeyUp="Window_KeyUp"> + KeyUp="Window_KeyUp" + PreviewMouseDown="Window_PreviewMouseDown"> @@ -120,10 +121,12 @@ - - - - + + + + + + diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index b618150..20ddb2b 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -195,20 +195,23 @@ namespace Damage_Calculator } #endregion - private void resetCanvas() + private void resetCanvas(bool updatedViewSettings = false) { if (this.IsInitialized) { this.pointsCanvas.Children.Clear(); - this.leftPoint = null; - this.rightPoint = null; - this.connectingLine = null; - this.bombCircle = null; - this.unitsDistance = -1; - this.textDistanceMetres.Text = "0"; - this.textDistanceUnits.Text = "0"; - this.txtResult.Text = "0"; - this.txtResultArmor.Text = "0"; + if (!updatedViewSettings) + { + this.leftPoint = null; + this.rightPoint = null; + this.connectingLine = null; + this.bombCircle = null; + this.unitsDistance = -1; + this.textDistanceMetres.Text = "0"; + this.textDistanceUnits.Text = "0"; + this.txtResult.Text = "0"; + this.txtResultArmor.Text = "0"; + } } } @@ -465,6 +468,9 @@ namespace Damage_Calculator if (this.leftPoint?.Circle != null) { + if (pointsCanvas.Children.IndexOf(this.leftPoint.Circle) == -1 && this.mnuShowDrawnMarkers.IsChecked == true) + pointsCanvas.Children.Add(this.leftPoint.Circle); + Canvas.SetLeft(this.leftPoint.Circle, (this.leftPoint.PercentageX * pointsCanvas.ActualWidth / 100f) - (this.leftPoint.Circle.Width / 2)); Canvas.SetTop(this.leftPoint.Circle, (this.leftPoint.PercentageY * pointsCanvas.ActualHeight / 100f) - (this.leftPoint.Circle.Height / 2)); this.leftPoint.Circle.Width = this.leftPoint.Circle.Height = this.leftPoint.PercentageScale * this.pointsCanvas.ActualWidth / 100f; @@ -472,6 +478,9 @@ namespace Damage_Calculator if (this.rightPoint?.Circle != null) { + if (pointsCanvas.Children.IndexOf(this.rightPoint.Circle) == -1 && this.mnuShowDrawnMarkers.IsChecked == true) + pointsCanvas.Children.Add(this.rightPoint.Circle); + Canvas.SetLeft(this.rightPoint.Circle, (this.rightPoint.PercentageX * pointsCanvas.ActualWidth / 100f) - (this.rightPoint.Circle.Width / 2)); Canvas.SetTop(this.rightPoint.Circle, (this.rightPoint.PercentageY * pointsCanvas.ActualHeight / 100f) - (this.rightPoint.Circle.Height / 2)); this.rightPoint.Circle.Width = this.rightPoint.Circle.Height = this.rightPoint.PercentageScale * this.pointsCanvas.ActualWidth / 100f; @@ -479,6 +488,9 @@ namespace Damage_Calculator if (this.bombCircle?.Circle != null) { + if (pointsCanvas.Children.IndexOf(this.bombCircle.Circle) == -1 && this.mnuShowDrawnMarkers.IsChecked == true) + pointsCanvas.Children.Add(this.bombCircle.Circle); + Canvas.SetLeft(this.bombCircle.Circle, (this.bombCircle.PercentageX * pointsCanvas.ActualWidth / 100f) - (this.bombCircle.Circle.Width / 2)); Canvas.SetTop(this.bombCircle.Circle, (this.bombCircle.PercentageY * pointsCanvas.ActualHeight / 100f) - (this.bombCircle.Circle.Height / 2)); this.bombCircle.Circle.Width = this.bombCircle.Circle.Height = this.bombCircle.PercentageScale * this.pointsCanvas.ActualWidth / 100f; @@ -511,7 +523,7 @@ namespace Damage_Calculator this.connectingLine.IsHitTestVisible = false; int indexLine = pointsCanvas.Children.IndexOf(this.connectingLine); - if (indexLine < 0) + if (indexLine < 0 && this.mnuShowDrawnMarkers.IsChecked == true) { pointsCanvas.Children.Add(this.connectingLine); this.lineDrawn = true; @@ -676,13 +688,11 @@ namespace Damage_Calculator private double calculateDotDistanceInUnits() { - Ellipse circleLeft = pointsCanvas.Children[pointsCanvas.Children.IndexOf(this.DrawMode == eDrawMode.Shooting ? this.leftPoint.Circle : this.bombCircle.Circle)] as Ellipse; - double leftX = Canvas.GetLeft(circleLeft) + circleLeft.ActualWidth / 2; - double leftY = Canvas.GetTop(circleLeft) + circleLeft.ActualHeight / 2; + double leftX = this.connectingLine.X1; + double leftY = this.connectingLine.Y1; - Ellipse circleRight = pointsCanvas.Children[pointsCanvas.Children.IndexOf(rightPoint.Circle)] as Ellipse; - double rightX = Canvas.GetLeft(circleRight) + circleRight.ActualWidth / 2; - double rightY = Canvas.GetTop(circleRight) + circleRight.ActualHeight / 2; + double rightX = this.connectingLine.X2; + double rightY = this.connectingLine.Y2; // Distance in shown pixels double diffPixels = Math.Sqrt(Math.Pow(Math.Abs(leftX - rightX), 2) + Math.Pow(Math.Abs(leftY - rightY), 2)); @@ -815,10 +825,25 @@ namespace Damage_Calculator } #region events + private void rightZoomBorder_SizeChanged(object sender, SizeChangedEventArgs e) + { + if (rightZoomBorder.IsZoomed) + { + rightZoomBorder.Reset(); + } + } + + private void Window_PreviewMouseDown(object sender, MouseButtonEventArgs e) + { + if (e.ChangedButton == MouseButton.Middle) + { + rightZoomBorder.Reset(); + } + } private void visibilityMenu_CheckChanged(object sender, RoutedEventArgs e) { - this.resetCanvas(); + this.resetCanvas(true); this.UpdateLayout(); } @@ -1022,18 +1047,6 @@ namespace Damage_Calculator this.rightZoomBorder.KeyUp(sender, e); } #endregion - - private void rightZoomBorder_SizeChanged(object sender, SizeChangedEventArgs e) - { - if(rightZoomBorder.Width < rightZoomBorder.Height) - { - rightZoomBorder.Height = rightZoomBorder.ActualWidth; - } - if (rightZoomBorder.IsZoomed) - { - rightZoomBorder.Reset(); - } - } } enum eDrawMode { Shooting, Bomb } diff --git a/DamageCalculator/DamageCalculator/ZoomBorder.cs b/DamageCalculator/DamageCalculator/ZoomBorder.cs index ca56ce4..f8cadcd 100644 --- a/DamageCalculator/DamageCalculator/ZoomBorder.cs +++ b/DamageCalculator/DamageCalculator/ZoomBorder.cs @@ -54,8 +54,6 @@ namespace Damage_Calculator this.MouseLeftButtonDown += child_MouseLeftButtonDown; this.MouseLeftButtonUp += child_MouseLeftButtonUp; this.MouseMove += child_MouseMove; - this.PreviewMouseDown += new MouseButtonEventHandler( - child_PreviewMouseDown); } } @@ -147,14 +145,6 @@ namespace Damage_Calculator } } - void child_PreviewMouseDown(object sender, MouseButtonEventArgs e) - { - if (e.ChangedButton == MouseButton.Middle && e.ButtonState == MouseButtonState.Pressed) - { - this.Reset(); - } - } - private void child_MouseMove(object sender, MouseEventArgs e) { if (child != null) diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe index a8ceb8e..de74198 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 ea21e9c..62e149d 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/obj/Debug/About.baml b/DamageCalculator/DamageCalculator/obj/Debug/About.baml index b3b11e8..109fe10 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/About.baml and b/DamageCalculator/DamageCalculator/obj/Debug/About.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/App.baml b/DamageCalculator/DamageCalculator/obj/Debug/App.baml index bdb0740..6d3e0b3 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/App.baml and b/DamageCalculator/DamageCalculator/obj/Debug/App.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe index a8ceb8e..de74198 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.g.resources b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources index 04b1cbf..62dcb85 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb index ea21e9c..62e149d 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/Help.baml b/DamageCalculator/DamageCalculator/obj/Debug/Help.baml index 7d7e2c6..c7d5e01 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/Help.baml and b/DamageCalculator/DamageCalculator/obj/Debug/Help.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml index ac9c9e2..f044a02 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml and b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs index 7dcb4d3..28cb244 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}" "DDEB88E6BF2411090CEFE97ECD05FAC168A9400B7A2D3FEBF6EE291BC90C4F86" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "520310F22F68AE4E47B66F6D92CC98AD8018EE1647882A1C45F9B52AC540A4BB" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -41,7 +41,7 @@ namespace Damage_Calculator { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowBombSites; @@ -49,7 +49,7 @@ namespace Damage_Calculator { #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowSpawnAreas; @@ -57,7 +57,7 @@ namespace Damage_Calculator { #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowStandardSpawns; @@ -65,7 +65,7 @@ namespace Damage_Calculator { #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShow2v2Spawns; @@ -73,7 +73,7 @@ namespace Damage_Calculator { #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowHostageSpawns; @@ -81,7 +81,7 @@ namespace Damage_Calculator { #line hidden - #line 23 "..\..\MainWindow.xaml" + #line 24 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; @@ -89,7 +89,7 @@ namespace Damage_Calculator { #line hidden - #line 24 "..\..\MainWindow.xaml" + #line 25 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers; @@ -97,7 +97,7 @@ namespace Damage_Calculator { #line hidden - #line 32 "..\..\MainWindow.xaml" + #line 33 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAbout; @@ -105,7 +105,7 @@ namespace Damage_Calculator { #line hidden - #line 33 "..\..\MainWindow.xaml" + #line 34 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; @@ -113,7 +113,7 @@ namespace Damage_Calculator { #line hidden - #line 47 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeShooting; @@ -121,7 +121,7 @@ namespace Damage_Calculator { #line hidden - #line 48 "..\..\MainWindow.xaml" + #line 49 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeBomb; @@ -129,7 +129,7 @@ namespace Damage_Calculator { #line hidden - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel topStackPanel; @@ -137,7 +137,7 @@ namespace Damage_Calculator { #line hidden - #line 52 "..\..\MainWindow.xaml" + #line 53 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboBoxMaps; @@ -145,7 +145,7 @@ namespace Damage_Calculator { #line hidden - #line 57 "..\..\MainWindow.xaml" + #line 58 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtEasterEggMetres; @@ -153,7 +153,7 @@ namespace Damage_Calculator { #line hidden - #line 58 "..\..\MainWindow.xaml" + #line 59 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceMetres; @@ -161,7 +161,7 @@ namespace Damage_Calculator { #line hidden - #line 62 "..\..\MainWindow.xaml" + #line 63 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceUnits; @@ -169,7 +169,7 @@ namespace Damage_Calculator { #line hidden - #line 65 "..\..\MainWindow.xaml" + #line 66 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectTop; @@ -177,7 +177,7 @@ namespace Damage_Calculator { #line hidden - #line 66 "..\..\MainWindow.xaml" + #line 67 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectSide; @@ -185,7 +185,7 @@ namespace Damage_Calculator { #line hidden - #line 67 "..\..\MainWindow.xaml" + #line 68 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel leftStackPanel; @@ -193,7 +193,7 @@ namespace Damage_Calculator { #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackArmorSeparated; @@ -201,7 +201,7 @@ namespace Damage_Calculator { #line hidden - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHelmet; @@ -209,7 +209,7 @@ namespace Damage_Calculator { #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkKevlar; @@ -217,7 +217,7 @@ namespace Damage_Calculator { #line hidden - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkArmorAny; @@ -225,7 +225,7 @@ namespace Damage_Calculator { #line hidden - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackAreaHit; @@ -233,7 +233,7 @@ namespace Damage_Calculator { #line hidden - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioHead; @@ -241,7 +241,7 @@ namespace Damage_Calculator { #line hidden - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioChestArms; @@ -249,7 +249,7 @@ namespace Damage_Calculator { #line hidden - #line 81 "..\..\MainWindow.xaml" + #line 82 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioStomach; @@ -257,7 +257,7 @@ namespace Damage_Calculator { #line hidden - #line 82 "..\..\MainWindow.xaml" + #line 83 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioLegs; @@ -265,7 +265,7 @@ namespace Damage_Calculator { #line hidden - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackWeaponUsed; @@ -273,7 +273,7 @@ namespace Damage_Calculator { #line hidden - #line 86 "..\..\MainWindow.xaml" + #line 87 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboWeapons; @@ -281,7 +281,7 @@ namespace Damage_Calculator { #line hidden - #line 90 "..\..\MainWindow.xaml" + #line 91 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResult; @@ -289,7 +289,7 @@ namespace Damage_Calculator { #line hidden - #line 91 "..\..\MainWindow.xaml" + #line 92 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResultArmor; @@ -297,7 +297,7 @@ namespace Damage_Calculator { #line hidden - #line 98 "..\..\MainWindow.xaml" + #line 99 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasMapFile; @@ -305,7 +305,7 @@ namespace Damage_Calculator { #line hidden - #line 99 "..\..\MainWindow.xaml" + #line 100 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasNavFile; @@ -313,7 +313,7 @@ namespace Damage_Calculator { #line hidden - #line 102 "..\..\MainWindow.xaml" + #line 103 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombMaxDamage; @@ -321,7 +321,7 @@ namespace Damage_Calculator { #line hidden - #line 106 "..\..\MainWindow.xaml" + #line 107 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombRadius; @@ -329,7 +329,7 @@ namespace Damage_Calculator { #line hidden - #line 113 "..\..\MainWindow.xaml" + #line 114 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorX; @@ -337,7 +337,7 @@ namespace Damage_Calculator { #line hidden - #line 117 "..\..\MainWindow.xaml" + #line 118 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorY; @@ -345,7 +345,7 @@ namespace Damage_Calculator { #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal Damage_Calculator.ZoomBorder rightZoomBorder; @@ -353,7 +353,7 @@ namespace Damage_Calculator { #line hidden - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Image mapImage; @@ -361,7 +361,7 @@ namespace Damage_Calculator { #line hidden - #line 125 "..\..\MainWindow.xaml" + #line 127 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; @@ -369,7 +369,7 @@ namespace Damage_Calculator { #line hidden - #line 129 "..\..\MainWindow.xaml" + #line 132 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -430,19 +430,25 @@ namespace Damage_Calculator { #line 14 "..\..\MainWindow.xaml" ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + #line default + #line hidden + + #line 15 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).PreviewMouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Window_PreviewMouseDown); + #line default #line hidden return; case 2: this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -451,13 +457,13 @@ namespace Damage_Calculator { case 3: this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -466,13 +472,13 @@ namespace Damage_Calculator { case 4: this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -481,13 +487,13 @@ namespace Damage_Calculator { case 5: this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -496,13 +502,13 @@ namespace Damage_Calculator { case 6: this.mnuShowHostageSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowHostageSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowHostageSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -511,13 +517,13 @@ namespace Damage_Calculator { case 7: this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 23 "..\..\MainWindow.xaml" + #line 24 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 23 "..\..\MainWindow.xaml" + #line 24 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -526,13 +532,13 @@ namespace Damage_Calculator { case 8: this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 24 "..\..\MainWindow.xaml" + #line 25 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 24 "..\..\MainWindow.xaml" + #line 25 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -540,7 +546,7 @@ namespace Damage_Calculator { return; case 9: - #line 27 "..\..\MainWindow.xaml" + #line 28 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -548,7 +554,7 @@ namespace Damage_Calculator { return; case 10: - #line 28 "..\..\MainWindow.xaml" + #line 29 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -557,7 +563,7 @@ namespace Damage_Calculator { case 11: this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); - #line 32 "..\..\MainWindow.xaml" + #line 33 "..\..\MainWindow.xaml" this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); #line default @@ -566,7 +572,7 @@ namespace Damage_Calculator { case 12: this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); - #line 33 "..\..\MainWindow.xaml" + #line 34 "..\..\MainWindow.xaml" this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); #line default @@ -575,7 +581,7 @@ namespace Damage_Calculator { case 13: this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); - #line 47 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); #line default @@ -584,7 +590,7 @@ namespace Damage_Calculator { case 14: this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); - #line 48 "..\..\MainWindow.xaml" + #line 49 "..\..\MainWindow.xaml" this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default @@ -596,7 +602,7 @@ namespace Damage_Calculator { case 16: this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 52 "..\..\MainWindow.xaml" + #line 53 "..\..\MainWindow.xaml" this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default @@ -626,13 +632,13 @@ namespace Damage_Calculator { case 24: this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -641,13 +647,13 @@ namespace Damage_Calculator { case 25: this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -656,13 +662,13 @@ namespace Damage_Calculator { case 26: this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -674,7 +680,7 @@ namespace Damage_Calculator { case 28: this.radioHead = ((System.Windows.Controls.RadioButton)(target)); - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -683,7 +689,7 @@ namespace Damage_Calculator { case 29: this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -692,7 +698,7 @@ namespace Damage_Calculator { case 30: this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - #line 81 "..\..\MainWindow.xaml" + #line 82 "..\..\MainWindow.xaml" this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -701,7 +707,7 @@ namespace Damage_Calculator { case 31: this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - #line 82 "..\..\MainWindow.xaml" + #line 83 "..\..\MainWindow.xaml" this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -713,7 +719,7 @@ namespace Damage_Calculator { case 33: this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - #line 86 "..\..\MainWindow.xaml" + #line 87 "..\..\MainWindow.xaml" this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); #line default @@ -749,19 +755,19 @@ namespace Damage_Calculator { case 43: this.mapImage = ((System.Windows.Controls.Image)(target)); - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); #line default #line hidden - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); #line default #line hidden - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); #line default diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs index 7dcb4d3..28cb244 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}" "DDEB88E6BF2411090CEFE97ECD05FAC168A9400B7A2D3FEBF6EE291BC90C4F86" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "520310F22F68AE4E47B66F6D92CC98AD8018EE1647882A1C45F9B52AC540A4BB" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -41,7 +41,7 @@ namespace Damage_Calculator { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowBombSites; @@ -49,7 +49,7 @@ namespace Damage_Calculator { #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowSpawnAreas; @@ -57,7 +57,7 @@ namespace Damage_Calculator { #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowStandardSpawns; @@ -65,7 +65,7 @@ namespace Damage_Calculator { #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShow2v2Spawns; @@ -73,7 +73,7 @@ namespace Damage_Calculator { #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowHostageSpawns; @@ -81,7 +81,7 @@ namespace Damage_Calculator { #line hidden - #line 23 "..\..\MainWindow.xaml" + #line 24 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; @@ -89,7 +89,7 @@ namespace Damage_Calculator { #line hidden - #line 24 "..\..\MainWindow.xaml" + #line 25 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers; @@ -97,7 +97,7 @@ namespace Damage_Calculator { #line hidden - #line 32 "..\..\MainWindow.xaml" + #line 33 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAbout; @@ -105,7 +105,7 @@ namespace Damage_Calculator { #line hidden - #line 33 "..\..\MainWindow.xaml" + #line 34 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; @@ -113,7 +113,7 @@ namespace Damage_Calculator { #line hidden - #line 47 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeShooting; @@ -121,7 +121,7 @@ namespace Damage_Calculator { #line hidden - #line 48 "..\..\MainWindow.xaml" + #line 49 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeBomb; @@ -129,7 +129,7 @@ namespace Damage_Calculator { #line hidden - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel topStackPanel; @@ -137,7 +137,7 @@ namespace Damage_Calculator { #line hidden - #line 52 "..\..\MainWindow.xaml" + #line 53 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboBoxMaps; @@ -145,7 +145,7 @@ namespace Damage_Calculator { #line hidden - #line 57 "..\..\MainWindow.xaml" + #line 58 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtEasterEggMetres; @@ -153,7 +153,7 @@ namespace Damage_Calculator { #line hidden - #line 58 "..\..\MainWindow.xaml" + #line 59 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceMetres; @@ -161,7 +161,7 @@ namespace Damage_Calculator { #line hidden - #line 62 "..\..\MainWindow.xaml" + #line 63 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceUnits; @@ -169,7 +169,7 @@ namespace Damage_Calculator { #line hidden - #line 65 "..\..\MainWindow.xaml" + #line 66 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectTop; @@ -177,7 +177,7 @@ namespace Damage_Calculator { #line hidden - #line 66 "..\..\MainWindow.xaml" + #line 67 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectSide; @@ -185,7 +185,7 @@ namespace Damage_Calculator { #line hidden - #line 67 "..\..\MainWindow.xaml" + #line 68 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel leftStackPanel; @@ -193,7 +193,7 @@ namespace Damage_Calculator { #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackArmorSeparated; @@ -201,7 +201,7 @@ namespace Damage_Calculator { #line hidden - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHelmet; @@ -209,7 +209,7 @@ namespace Damage_Calculator { #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkKevlar; @@ -217,7 +217,7 @@ namespace Damage_Calculator { #line hidden - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkArmorAny; @@ -225,7 +225,7 @@ namespace Damage_Calculator { #line hidden - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackAreaHit; @@ -233,7 +233,7 @@ namespace Damage_Calculator { #line hidden - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioHead; @@ -241,7 +241,7 @@ namespace Damage_Calculator { #line hidden - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioChestArms; @@ -249,7 +249,7 @@ namespace Damage_Calculator { #line hidden - #line 81 "..\..\MainWindow.xaml" + #line 82 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioStomach; @@ -257,7 +257,7 @@ namespace Damage_Calculator { #line hidden - #line 82 "..\..\MainWindow.xaml" + #line 83 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioLegs; @@ -265,7 +265,7 @@ namespace Damage_Calculator { #line hidden - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackWeaponUsed; @@ -273,7 +273,7 @@ namespace Damage_Calculator { #line hidden - #line 86 "..\..\MainWindow.xaml" + #line 87 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboWeapons; @@ -281,7 +281,7 @@ namespace Damage_Calculator { #line hidden - #line 90 "..\..\MainWindow.xaml" + #line 91 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResult; @@ -289,7 +289,7 @@ namespace Damage_Calculator { #line hidden - #line 91 "..\..\MainWindow.xaml" + #line 92 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResultArmor; @@ -297,7 +297,7 @@ namespace Damage_Calculator { #line hidden - #line 98 "..\..\MainWindow.xaml" + #line 99 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasMapFile; @@ -305,7 +305,7 @@ namespace Damage_Calculator { #line hidden - #line 99 "..\..\MainWindow.xaml" + #line 100 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasNavFile; @@ -313,7 +313,7 @@ namespace Damage_Calculator { #line hidden - #line 102 "..\..\MainWindow.xaml" + #line 103 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombMaxDamage; @@ -321,7 +321,7 @@ namespace Damage_Calculator { #line hidden - #line 106 "..\..\MainWindow.xaml" + #line 107 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombRadius; @@ -329,7 +329,7 @@ namespace Damage_Calculator { #line hidden - #line 113 "..\..\MainWindow.xaml" + #line 114 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorX; @@ -337,7 +337,7 @@ namespace Damage_Calculator { #line hidden - #line 117 "..\..\MainWindow.xaml" + #line 118 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorY; @@ -345,7 +345,7 @@ namespace Damage_Calculator { #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal Damage_Calculator.ZoomBorder rightZoomBorder; @@ -353,7 +353,7 @@ namespace Damage_Calculator { #line hidden - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Image mapImage; @@ -361,7 +361,7 @@ namespace Damage_Calculator { #line hidden - #line 125 "..\..\MainWindow.xaml" + #line 127 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; @@ -369,7 +369,7 @@ namespace Damage_Calculator { #line hidden - #line 129 "..\..\MainWindow.xaml" + #line 132 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -430,19 +430,25 @@ namespace Damage_Calculator { #line 14 "..\..\MainWindow.xaml" ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + #line default + #line hidden + + #line 15 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).PreviewMouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Window_PreviewMouseDown); + #line default #line hidden return; case 2: this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -451,13 +457,13 @@ namespace Damage_Calculator { case 3: this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -466,13 +472,13 @@ namespace Damage_Calculator { case 4: this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -481,13 +487,13 @@ namespace Damage_Calculator { case 5: this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -496,13 +502,13 @@ namespace Damage_Calculator { case 6: this.mnuShowHostageSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowHostageSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowHostageSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -511,13 +517,13 @@ namespace Damage_Calculator { case 7: this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 23 "..\..\MainWindow.xaml" + #line 24 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 23 "..\..\MainWindow.xaml" + #line 24 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -526,13 +532,13 @@ namespace Damage_Calculator { case 8: this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 24 "..\..\MainWindow.xaml" + #line 25 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 24 "..\..\MainWindow.xaml" + #line 25 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -540,7 +546,7 @@ namespace Damage_Calculator { return; case 9: - #line 27 "..\..\MainWindow.xaml" + #line 28 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -548,7 +554,7 @@ namespace Damage_Calculator { return; case 10: - #line 28 "..\..\MainWindow.xaml" + #line 29 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -557,7 +563,7 @@ namespace Damage_Calculator { case 11: this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); - #line 32 "..\..\MainWindow.xaml" + #line 33 "..\..\MainWindow.xaml" this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); #line default @@ -566,7 +572,7 @@ namespace Damage_Calculator { case 12: this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); - #line 33 "..\..\MainWindow.xaml" + #line 34 "..\..\MainWindow.xaml" this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); #line default @@ -575,7 +581,7 @@ namespace Damage_Calculator { case 13: this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); - #line 47 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); #line default @@ -584,7 +590,7 @@ namespace Damage_Calculator { case 14: this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); - #line 48 "..\..\MainWindow.xaml" + #line 49 "..\..\MainWindow.xaml" this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default @@ -596,7 +602,7 @@ namespace Damage_Calculator { case 16: this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 52 "..\..\MainWindow.xaml" + #line 53 "..\..\MainWindow.xaml" this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default @@ -626,13 +632,13 @@ namespace Damage_Calculator { case 24: this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -641,13 +647,13 @@ namespace Damage_Calculator { case 25: this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -656,13 +662,13 @@ namespace Damage_Calculator { case 26: this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -674,7 +680,7 @@ namespace Damage_Calculator { case 28: this.radioHead = ((System.Windows.Controls.RadioButton)(target)); - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -683,7 +689,7 @@ namespace Damage_Calculator { case 29: this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -692,7 +698,7 @@ namespace Damage_Calculator { case 30: this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - #line 81 "..\..\MainWindow.xaml" + #line 82 "..\..\MainWindow.xaml" this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -701,7 +707,7 @@ namespace Damage_Calculator { case 31: this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - #line 82 "..\..\MainWindow.xaml" + #line 83 "..\..\MainWindow.xaml" this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -713,7 +719,7 @@ namespace Damage_Calculator { case 33: this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - #line 86 "..\..\MainWindow.xaml" + #line 87 "..\..\MainWindow.xaml" this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); #line default @@ -749,19 +755,19 @@ namespace Damage_Calculator { case 43: this.mapImage = ((System.Windows.Controls.Image)(target)); - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); #line default #line hidden - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); #line default #line hidden - #line 124 "..\..\MainWindow.xaml" + #line 126 "..\..\MainWindow.xaml" this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); #line default diff --git a/DamageCalculator/DamageCalculator/obj/Debug/ctrlPlayerSpawn.baml b/DamageCalculator/DamageCalculator/obj/Debug/ctrlPlayerSpawn.baml index 6340093..ed5c287 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/ctrlPlayerSpawn.baml and b/DamageCalculator/DamageCalculator/obj/Debug/ctrlPlayerSpawn.baml differ