From 77e1bdf273500ee67026a67a028629571a95a860 Mon Sep 17 00:00:00 2001 From: Mathias Lui Date: Wed, 1 Feb 2023 23:16:38 +0100 Subject: [PATCH] Make it inconvenient to show thanks & Increase version to 1.3.1.2 * User will have to hold only the Ctrl key while opening the about window to show extra possibly cringe info --- DamageCalculator/DamageCalculator/About.xaml | 30 ++++++++++--------- .../DamageCalculator/About.xaml.cs | 6 +++- .../DamageCalculator/DamageCalculator.csproj | 4 +-- .../DamageCalculator/MainWindow.xaml.cs | 7 ++++- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/DamageCalculator/DamageCalculator/About.xaml b/DamageCalculator/DamageCalculator/About.xaml index 26813a6..3319d69 100644 --- a/DamageCalculator/DamageCalculator/About.xaml +++ b/DamageCalculator/DamageCalculator/About.xaml @@ -7,23 +7,25 @@ mc:Ignorable="d" Style="{DynamicResource CustomWindowStyle}" WindowStartupLocation="CenterOwner" - Title="About" Height="493" Width="418" ResizeMode="NoResize"> + Title="About" Height="493" Width="418" ResizeMode="NoResize" SizeToContent="Height"> - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/DamageCalculator/DamageCalculator/About.xaml.cs b/DamageCalculator/DamageCalculator/About.xaml.cs index 77e35b5..2322f3f 100644 --- a/DamageCalculator/DamageCalculator/About.xaml.cs +++ b/DamageCalculator/DamageCalculator/About.xaml.cs @@ -19,9 +19,13 @@ namespace Damage_Calculator /// public partial class About : Window { - public About() + public About(bool showThanks = false) { InitializeComponent(); + + if (showThanks) + this.thanksStack.Visibility = Visibility.Visible; + txtVersion.Text = "Version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); } } diff --git a/DamageCalculator/DamageCalculator/DamageCalculator.csproj b/DamageCalculator/DamageCalculator/DamageCalculator.csproj index a499305..488d70f 100644 --- a/DamageCalculator/DamageCalculator/DamageCalculator.csproj +++ b/DamageCalculator/DamageCalculator/DamageCalculator.csproj @@ -11,8 +11,8 @@ 27.ico - 1.3.1.0 - 1.3.1.0 + 1.3.1.2 + 1.3.1.2 diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index 3e187eb..c36287e 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -2110,7 +2110,12 @@ namespace Damage_Calculator private void mnuAbout_Click(object sender, RoutedEventArgs e) { - About about = new About(); + bool showThanks = false; + + if (Keyboard.Modifiers == ModifierKeys.Control) + showThanks = true; + + About about = new About(showThanks); about.Owner = this; about.ShowDialog(); }