diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo index 8bf2f4d..f9108f8 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 f2eba20..07fd78c 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Damage_Calculator" mc:Ignorable="d" - Title="CS:GO Damage Calculator" Height="566" Width="826" MinHeight="700" MinWidth="700" + Title="CS:GO Damage Calculator" Height="566" Width="877" MinHeight="700" MinWidth="700" Style="{DynamicResource CustomWindowStyle}" WindowStartupLocation="CenterScreen" Icon="27.ico" WindowState="Maximized" @@ -119,7 +119,7 @@ - + diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index d5d33e8..b618150 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -1022,6 +1022,18 @@ 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/Properties/AssemblyInfo.cs b/DamageCalculator/DamageCalculator/Properties/AssemblyInfo.cs index b91b22c..dd08ec3 100644 --- a/DamageCalculator/DamageCalculator/Properties/AssemblyInfo.cs +++ b/DamageCalculator/DamageCalculator/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.1.0.1")] +[assembly: AssemblyFileVersion("1.1.0.1")] diff --git a/DamageCalculator/DamageCalculator/ZoomBorder.cs b/DamageCalculator/DamageCalculator/ZoomBorder.cs index 3b63c14..ca56ce4 100644 --- a/DamageCalculator/DamageCalculator/ZoomBorder.cs +++ b/DamageCalculator/DamageCalculator/ZoomBorder.cs @@ -13,6 +13,8 @@ namespace Damage_Calculator private Point start; private bool isSpacebarPressed = false; + public bool IsZoomed { get; set; } + private TranslateTransform GetTranslateTransform(UIElement element) { return (TranslateTransform)((TransformGroup)element.RenderTransform) @@ -102,7 +104,10 @@ namespace Damage_Calculator double zoom = e.Delta > 0 ? .2 : -.2; if (!(e.Delta > 0) && (st.ScaleX < 1 || st.ScaleY < 1)) + { + this.IsZoomed = false; return; + } Point relative = e.GetPosition(child); double absoluteX; @@ -116,6 +121,8 @@ namespace Damage_Calculator tt.X = absoluteX - relative.X * st.ScaleX; tt.Y = absoluteY - relative.Y * st.ScaleY; + + this.IsZoomed = true; } } diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe index c7dee8d..a8ceb8e 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 db9c276..ea21e9c 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 f457db3..7faa07b 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 7d958bb..0c73d9b 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 c7dee8d..a8ceb8e 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 e4872da..04b1cbf 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 db9c276..ea21e9c 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 bed89b8..7d7e2c6 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 c9f8847..64a3703 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}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568" +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "315BB8A752151A28FB840C01C842E1FDC350EDA4B2F1BB5B03A031E9F79A4275" //------------------------------------------------------------------------------ // // 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 c9f8847..64a3703 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}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568" +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "315BB8A752151A28FB840C01C842E1FDC350EDA4B2F1BB5B03A031E9F79A4275" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml index 78e85dd..ac9c9e2 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 75377cf..7dcb4d3 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}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DDEB88E6BF2411090CEFE97ECD05FAC168A9400B7A2D3FEBF6EE291BC90C4F86" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs index 75377cf..7dcb4d3 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}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DDEB88E6BF2411090CEFE97ECD05FAC168A9400B7A2D3FEBF6EE291BC90C4F86" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Release/About.baml b/DamageCalculator/DamageCalculator/obj/Release/About.baml index 9dc9bb2..fe8228d 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/About.baml and b/DamageCalculator/DamageCalculator/obj/Release/About.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/App.baml b/DamageCalculator/DamageCalculator/obj/Release/App.baml index 346d7c2..286a196 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/App.baml and b/DamageCalculator/DamageCalculator/obj/Release/App.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe index f457db3..7faa07b 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 ee7febb..597b165 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 7d958bb..0c73d9b 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/Help.baml b/DamageCalculator/DamageCalculator/obj/Release/Help.baml index beab066..dc1c091 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/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml index 5c3fa9f..ba0cbb0 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 75377cf..7dcb4d3 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}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DDEB88E6BF2411090CEFE97ECD05FAC168A9400B7A2D3FEBF6EE291BC90C4F86" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs index 75377cf..7dcb4d3 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}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DDEB88E6BF2411090CEFE97ECD05FAC168A9400B7A2D3FEBF6EE291BC90C4F86" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml index 9732cde..ccb8a32 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml and b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml differ