diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo index bf55c17..5b4821a 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 28b9155..848cc53 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -227,6 +227,7 @@ namespace Damage_Calculator this.chkHasNavFile.IsChecked = map.NavFilePath != null; this.resetCanvas(); + this.rightZoomBorder.Reset(); if (map.MapType == CsgoMap.eMapType.Defusal) { diff --git a/DamageCalculator/DamageCalculator/ZoomBorder.cs b/DamageCalculator/DamageCalculator/ZoomBorder.cs index fc85b8f..3b63c14 100644 --- a/DamageCalculator/DamageCalculator/ZoomBorder.cs +++ b/DamageCalculator/DamageCalculator/ZoomBorder.cs @@ -78,13 +78,19 @@ namespace Damage_Calculator public void KeyDown(object sender, KeyEventArgs e) { if (e.Key == Key.Space) + { this.isSpacebarPressed = true; + this.Cursor = Cursors.SizeAll; + } } public void KeyUp(object sender, KeyEventArgs e) { if (e.Key == Key.Space) + { this.isSpacebarPressed = false; + this.Cursor = null; + } } private void child_MouseWheel(object sender, MouseWheelEventArgs e) diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe index 13b5c9e..cf6bdb5 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 cb94996..504d388 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 873da36..30c4f59 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 c329b90..aa71aef 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 13b5c9e..cf6bdb5 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 d0db7c6..e8b2d75 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 cb94996..504d388 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 56bb482..bed89b8 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/Help.g.cs b/DamageCalculator/DamageCalculator/obj/Debug/Help.g.cs index 2f33d3c..c9f8847 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/Help.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Debug/Help.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BBD118A25710AD7297EFA440D952E55B704798D5E6B6F4E9B11039094AF8A14" +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Debug/Help.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/Help.g.i.cs index 2f33d3c..c9f8847 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/Help.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Debug/Help.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BBD118A25710AD7297EFA440D952E55B704798D5E6B6F4E9B11039094AF8A14" +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe index 873da36..30c4f59 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.g.resources b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources index a473656..1c43a84 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb index c329b90..aa71aef 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/CSGO Damage Calculator_MarkupCompile.cache b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache index 601ddc9..74552ac 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache +++ b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache @@ -12,7 +12,7 @@ TRACE D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\App.xaml 8-1784528412 -31-767171675 +321055026254 15-431277860 About.xaml;ctrlPlayerSpawn.xaml;Help.xaml;MainWindow.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml; diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache index a727ebf..485b8e7 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache +++ b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -fddaf16b88da1a3e4210815ec520282e697487d3 +f947d9d0993fddd141bcd287571846dd7eaa3263 diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt index 3a89a62..1b7b493 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt +++ b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt @@ -29,3 +29,4 @@ D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\ob D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\DamageCalculator.csproj.CoreCompileInputs.cache D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator.exe D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator.pdb +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\GeneratedInternalTypeHelper.g.cs diff --git a/DamageCalculator/DamageCalculator/obj/Release/GeneratedInternalTypeHelper.g.cs b/DamageCalculator/DamageCalculator/obj/Release/GeneratedInternalTypeHelper.g.cs new file mode 100644 index 0000000..136dd1b --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/GeneratedInternalTypeHelper.g.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Release/GeneratedInternalTypeHelper.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/GeneratedInternalTypeHelper.g.i.cs new file mode 100644 index 0000000..136dd1b --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/GeneratedInternalTypeHelper.g.i.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.baml b/DamageCalculator/DamageCalculator/obj/Release/Help.baml index e7d75d2..b6551b1 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/Help.baml and b/DamageCalculator/DamageCalculator/obj/Release/Help.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs b/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs index 2f33d3c..c9f8847 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BBD118A25710AD7297EFA440D952E55B704798D5E6B6F4E9B11039094AF8A14" +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs index 2f33d3c..c9f8847 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BBD118A25710AD7297EFA440D952E55B704798D5E6B6F4E9B11039094AF8A14" +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml index d88b347..feecf11 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml and b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs index bd8c7f7..9c99c48 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}" "9F019158B8352DCE8981F0BC66CF6ED55D2097B5B9C746213F2697B990FD5B48" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23" //------------------------------------------------------------------------------ // // 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 17 "..\..\MainWindow.xaml" + #line 18 "..\..\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 18 "..\..\MainWindow.xaml" + #line 19 "..\..\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 19 "..\..\MainWindow.xaml" + #line 20 "..\..\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 20 "..\..\MainWindow.xaml" + #line 21 "..\..\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 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; @@ -81,7 +81,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 mnuShowDrawnMarkers; @@ -89,7 +89,7 @@ namespace Damage_Calculator { #line hidden - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAbout; @@ -97,7 +97,7 @@ namespace Damage_Calculator { #line hidden - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; @@ -105,7 +105,7 @@ namespace Damage_Calculator { #line hidden - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeShooting; @@ -113,7 +113,7 @@ namespace Damage_Calculator { #line hidden - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeBomb; @@ -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.StackPanel topStackPanel; @@ -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.ComboBox comboBoxMaps; @@ -137,7 +137,7 @@ namespace Damage_Calculator { #line hidden - #line 55 "..\..\MainWindow.xaml" + #line 56 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtEasterEggMetres; @@ -145,7 +145,7 @@ namespace Damage_Calculator { #line hidden - #line 56 "..\..\MainWindow.xaml" + #line 57 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceMetres; @@ -153,7 +153,7 @@ namespace Damage_Calculator { #line hidden - #line 60 "..\..\MainWindow.xaml" + #line 61 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceUnits; @@ -161,7 +161,7 @@ namespace Damage_Calculator { #line hidden - #line 63 "..\..\MainWindow.xaml" + #line 64 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectTop; @@ -169,7 +169,7 @@ namespace Damage_Calculator { #line hidden - #line 64 "..\..\MainWindow.xaml" + #line 65 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectSide; @@ -177,7 +177,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.Controls.StackPanel leftStackPanel; @@ -185,7 +185,7 @@ namespace Damage_Calculator { #line hidden - #line 69 "..\..\MainWindow.xaml" + #line 70 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackArmorSeparated; @@ -193,7 +193,7 @@ namespace Damage_Calculator { #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHelmet; @@ -201,7 +201,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.CheckBox chkKevlar; @@ -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 chkArmorAny; @@ -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.StackPanel stackAreaHit; @@ -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.RadioButton radioHead; @@ -233,7 +233,7 @@ namespace Damage_Calculator { #line hidden - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioChestArms; @@ -241,7 +241,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 radioStomach; @@ -249,7 +249,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 radioLegs; @@ -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.StackPanel stackWeaponUsed; @@ -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.ComboBox comboWeapons; @@ -273,7 +273,7 @@ namespace Damage_Calculator { #line hidden - #line 88 "..\..\MainWindow.xaml" + #line 89 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResult; @@ -281,7 +281,7 @@ namespace Damage_Calculator { #line hidden - #line 89 "..\..\MainWindow.xaml" + #line 90 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResultArmor; @@ -289,7 +289,7 @@ namespace Damage_Calculator { #line hidden - #line 96 "..\..\MainWindow.xaml" + #line 97 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasMapFile; @@ -297,7 +297,7 @@ namespace Damage_Calculator { #line hidden - #line 97 "..\..\MainWindow.xaml" + #line 98 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasNavFile; @@ -305,7 +305,7 @@ namespace Damage_Calculator { #line hidden - #line 100 "..\..\MainWindow.xaml" + #line 101 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombMaxDamage; @@ -313,7 +313,7 @@ namespace Damage_Calculator { #line hidden - #line 104 "..\..\MainWindow.xaml" + #line 105 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombRadius; @@ -321,7 +321,7 @@ namespace Damage_Calculator { #line hidden - #line 111 "..\..\MainWindow.xaml" + #line 112 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorX; @@ -329,7 +329,7 @@ namespace Damage_Calculator { #line hidden - #line 115 "..\..\MainWindow.xaml" + #line 116 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorY; @@ -337,17 +337,9 @@ namespace Damage_Calculator { #line hidden - #line 120 "..\..\MainWindow.xaml" + #line 121 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Viewbox rightViewbox; - - #line default - #line hidden - - - #line 122 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image mapImage; + internal Damage_Calculator.ZoomBorder rightZoomBorder; #line default #line hidden @@ -355,13 +347,21 @@ namespace Damage_Calculator { #line 123 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Image mapImage; + + #line default + #line hidden + + + #line 124 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; #line default #line hidden - #line 127 "..\..\MainWindow.xaml" + #line 128 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -389,6 +389,13 @@ namespace Damage_Calculator { #line hidden } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) { + return System.Delegate.CreateDelegate(delegateType, this, handler); + } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -409,19 +416,25 @@ namespace Damage_Calculator { #line 13 "..\..\MainWindow.xaml" ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + #line default + #line hidden + + #line 14 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + #line default #line hidden return; case 2: this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -430,13 +443,13 @@ namespace Damage_Calculator { case 3: this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -445,13 +458,13 @@ namespace Damage_Calculator { case 4: this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -460,13 +473,13 @@ namespace Damage_Calculator { case 5: this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -475,13 +488,13 @@ namespace Damage_Calculator { case 6: this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -490,13 +503,13 @@ namespace Damage_Calculator { case 7: this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -504,7 +517,7 @@ namespace Damage_Calculator { return; case 8: - #line 25 "..\..\MainWindow.xaml" + #line 26 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -512,7 +525,7 @@ namespace Damage_Calculator { return; case 9: - #line 26 "..\..\MainWindow.xaml" + #line 27 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -521,7 +534,7 @@ namespace Damage_Calculator { case 10: this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); #line default @@ -530,7 +543,7 @@ namespace Damage_Calculator { case 11: this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); #line default @@ -539,7 +552,7 @@ namespace Damage_Calculator { case 12: this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); #line default @@ -548,7 +561,7 @@ namespace Damage_Calculator { case 13: this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default @@ -560,7 +573,7 @@ namespace Damage_Calculator { case 15: this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default @@ -590,13 +603,13 @@ namespace Damage_Calculator { case 23: this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -605,13 +618,13 @@ namespace Damage_Calculator { case 24: this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -620,13 +633,13 @@ namespace Damage_Calculator { case 25: this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -638,7 +651,7 @@ namespace Damage_Calculator { case 27: this.radioHead = ((System.Windows.Controls.RadioButton)(target)); - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -647,7 +660,7 @@ namespace Damage_Calculator { case 28: this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -656,7 +669,7 @@ namespace Damage_Calculator { case 29: this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -665,7 +678,7 @@ namespace Damage_Calculator { case 30: this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -677,7 +690,7 @@ namespace Damage_Calculator { case 32: this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); #line default @@ -708,24 +721,24 @@ namespace Damage_Calculator { this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); return; case 41: - this.rightViewbox = ((System.Windows.Controls.Viewbox)(target)); + this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target)); return; case 42: this.mapImage = ((System.Windows.Controls.Image)(target)); - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); #line default diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs index bd8c7f7..9c99c48 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}" "9F019158B8352DCE8981F0BC66CF6ED55D2097B5B9C746213F2697B990FD5B48" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23" //------------------------------------------------------------------------------ // // 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 17 "..\..\MainWindow.xaml" + #line 18 "..\..\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 18 "..\..\MainWindow.xaml" + #line 19 "..\..\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 19 "..\..\MainWindow.xaml" + #line 20 "..\..\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 20 "..\..\MainWindow.xaml" + #line 21 "..\..\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 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; @@ -81,7 +81,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 mnuShowDrawnMarkers; @@ -89,7 +89,7 @@ namespace Damage_Calculator { #line hidden - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAbout; @@ -97,7 +97,7 @@ namespace Damage_Calculator { #line hidden - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; @@ -105,7 +105,7 @@ namespace Damage_Calculator { #line hidden - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeShooting; @@ -113,7 +113,7 @@ namespace Damage_Calculator { #line hidden - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeBomb; @@ -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.StackPanel topStackPanel; @@ -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.ComboBox comboBoxMaps; @@ -137,7 +137,7 @@ namespace Damage_Calculator { #line hidden - #line 55 "..\..\MainWindow.xaml" + #line 56 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtEasterEggMetres; @@ -145,7 +145,7 @@ namespace Damage_Calculator { #line hidden - #line 56 "..\..\MainWindow.xaml" + #line 57 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceMetres; @@ -153,7 +153,7 @@ namespace Damage_Calculator { #line hidden - #line 60 "..\..\MainWindow.xaml" + #line 61 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceUnits; @@ -161,7 +161,7 @@ namespace Damage_Calculator { #line hidden - #line 63 "..\..\MainWindow.xaml" + #line 64 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectTop; @@ -169,7 +169,7 @@ namespace Damage_Calculator { #line hidden - #line 64 "..\..\MainWindow.xaml" + #line 65 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectSide; @@ -177,7 +177,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.Controls.StackPanel leftStackPanel; @@ -185,7 +185,7 @@ namespace Damage_Calculator { #line hidden - #line 69 "..\..\MainWindow.xaml" + #line 70 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackArmorSeparated; @@ -193,7 +193,7 @@ namespace Damage_Calculator { #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHelmet; @@ -201,7 +201,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.CheckBox chkKevlar; @@ -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 chkArmorAny; @@ -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.StackPanel stackAreaHit; @@ -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.RadioButton radioHead; @@ -233,7 +233,7 @@ namespace Damage_Calculator { #line hidden - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioChestArms; @@ -241,7 +241,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 radioStomach; @@ -249,7 +249,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 radioLegs; @@ -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.StackPanel stackWeaponUsed; @@ -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.ComboBox comboWeapons; @@ -273,7 +273,7 @@ namespace Damage_Calculator { #line hidden - #line 88 "..\..\MainWindow.xaml" + #line 89 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResult; @@ -281,7 +281,7 @@ namespace Damage_Calculator { #line hidden - #line 89 "..\..\MainWindow.xaml" + #line 90 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResultArmor; @@ -289,7 +289,7 @@ namespace Damage_Calculator { #line hidden - #line 96 "..\..\MainWindow.xaml" + #line 97 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasMapFile; @@ -297,7 +297,7 @@ namespace Damage_Calculator { #line hidden - #line 97 "..\..\MainWindow.xaml" + #line 98 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasNavFile; @@ -305,7 +305,7 @@ namespace Damage_Calculator { #line hidden - #line 100 "..\..\MainWindow.xaml" + #line 101 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombMaxDamage; @@ -313,7 +313,7 @@ namespace Damage_Calculator { #line hidden - #line 104 "..\..\MainWindow.xaml" + #line 105 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombRadius; @@ -321,7 +321,7 @@ namespace Damage_Calculator { #line hidden - #line 111 "..\..\MainWindow.xaml" + #line 112 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorX; @@ -329,7 +329,7 @@ namespace Damage_Calculator { #line hidden - #line 115 "..\..\MainWindow.xaml" + #line 116 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorY; @@ -337,17 +337,9 @@ namespace Damage_Calculator { #line hidden - #line 120 "..\..\MainWindow.xaml" + #line 121 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Viewbox rightViewbox; - - #line default - #line hidden - - - #line 122 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image mapImage; + internal Damage_Calculator.ZoomBorder rightZoomBorder; #line default #line hidden @@ -355,13 +347,21 @@ namespace Damage_Calculator { #line 123 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Image mapImage; + + #line default + #line hidden + + + #line 124 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; #line default #line hidden - #line 127 "..\..\MainWindow.xaml" + #line 128 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -389,6 +389,13 @@ namespace Damage_Calculator { #line hidden } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) { + return System.Delegate.CreateDelegate(delegateType, this, handler); + } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -409,19 +416,25 @@ namespace Damage_Calculator { #line 13 "..\..\MainWindow.xaml" ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + #line default + #line hidden + + #line 14 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + #line default #line hidden return; case 2: this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -430,13 +443,13 @@ namespace Damage_Calculator { case 3: this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -445,13 +458,13 @@ namespace Damage_Calculator { case 4: this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -460,13 +473,13 @@ namespace Damage_Calculator { case 5: this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -475,13 +488,13 @@ namespace Damage_Calculator { case 6: this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -490,13 +503,13 @@ namespace Damage_Calculator { case 7: this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -504,7 +517,7 @@ namespace Damage_Calculator { return; case 8: - #line 25 "..\..\MainWindow.xaml" + #line 26 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -512,7 +525,7 @@ namespace Damage_Calculator { return; case 9: - #line 26 "..\..\MainWindow.xaml" + #line 27 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -521,7 +534,7 @@ namespace Damage_Calculator { case 10: this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); #line default @@ -530,7 +543,7 @@ namespace Damage_Calculator { case 11: this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); #line default @@ -539,7 +552,7 @@ namespace Damage_Calculator { case 12: this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); #line default @@ -548,7 +561,7 @@ namespace Damage_Calculator { case 13: this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default @@ -560,7 +573,7 @@ namespace Damage_Calculator { case 15: this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default @@ -590,13 +603,13 @@ namespace Damage_Calculator { case 23: this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -605,13 +618,13 @@ namespace Damage_Calculator { case 24: this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -620,13 +633,13 @@ namespace Damage_Calculator { case 25: this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -638,7 +651,7 @@ namespace Damage_Calculator { case 27: this.radioHead = ((System.Windows.Controls.RadioButton)(target)); - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -647,7 +660,7 @@ namespace Damage_Calculator { case 28: this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -656,7 +669,7 @@ namespace Damage_Calculator { case 29: this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -665,7 +678,7 @@ namespace Damage_Calculator { case 30: this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -677,7 +690,7 @@ namespace Damage_Calculator { case 32: this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); #line default @@ -708,24 +721,24 @@ namespace Damage_Calculator { this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); return; case 41: - this.rightViewbox = ((System.Windows.Controls.Viewbox)(target)); + this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target)); return; case 42: this.mapImage = ((System.Windows.Controls.Image)(target)); - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); #line default