From 28308233d3abc27b72312c4d7ca2c7c78a036f45 Mon Sep 17 00:00:00 2001
From: TollyH <ptolemyhill@sky.com>
Date: Tue, 22 Feb 2022 14:11:18 +0000
Subject: [PATCH] Fixed incorrect cursor being shown over total candies per
 second

---
 App.xaml                | 2 +-
 App.xaml.cs             | 8 +-------
 CandyClicker.csproj     | 6 +++---
 CustomiseWindow.xaml    | 2 +-
 CustomiseWindow.xaml.cs | 2 +-
 MainWindow.xaml         | 4 ++--
 MainWindow.xaml.cs      | 2 +-
 Shop.cs                 | 2 +-
 ShopControl.xaml        | 2 +-
 ShopControl.xaml.cs     | 2 +-
 10 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/App.xaml b/App.xaml
index 31c1430..5f1c293 100644
--- a/App.xaml
+++ b/App.xaml
@@ -1,5 +1,5 @@
 <!--
-    Candy Clicker ver. 1.1.0
+    Candy Clicker ver. 1.1.1
     Copyright © 2021-2022  Ptolemy Hill
 -->
 <Application x:Class="CandyClicker.App"
diff --git a/App.xaml.cs b/App.xaml.cs
index 0e15713..0c7f337 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -1,14 +1,8 @@
 /*
- * Candy Clicker ver. 1.1.0
+ * Candy Clicker ver. 1.1.1
  * Copyright © 2021-2022  Ptolemy Hill
  */
 
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace CandyClicker
diff --git a/CandyClicker.csproj b/CandyClicker.csproj
index f05ec7d..aeb3932 100644
--- a/CandyClicker.csproj
+++ b/CandyClicker.csproj
@@ -11,9 +11,9 @@
     <Description>A simple candy clicking game written in C# and WPF</Description>
     <Copyright>Copyright © 2021-2022  Ptolemy Hill</Copyright>
     <NeutralLanguage>en-GB</NeutralLanguage>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
-    <FileVersion>1.1.0</FileVersion>
-    <Version>1.1.0</Version>
+    <AssemblyVersion>1.1.1</AssemblyVersion>
+    <FileVersion>1.1.1</FileVersion>
+    <Version>1.1.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/CustomiseWindow.xaml b/CustomiseWindow.xaml
index bf3d176..420edb4 100644
--- a/CustomiseWindow.xaml
+++ b/CustomiseWindow.xaml
@@ -1,5 +1,5 @@
 <!--
-    Candy Clicker ver. 1.1.0
+    Candy Clicker ver. 1.1.1
     Copyright © 2021-2022  Ptolemy Hill
 -->
 <Window x:Class="CandyClicker.CustomiseWindow"
diff --git a/CustomiseWindow.xaml.cs b/CustomiseWindow.xaml.cs
index f217451..bec4c3b 100644
--- a/CustomiseWindow.xaml.cs
+++ b/CustomiseWindow.xaml.cs
@@ -1,5 +1,5 @@
 /*
- * Candy Clicker ver. 1.1.0
+ * Candy Clicker ver. 1.1.1
  * Copyright © 2021-2022  Ptolemy Hill
  */
 using Microsoft.Win32;
diff --git a/MainWindow.xaml b/MainWindow.xaml
index a58bdf8..b3b932a 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -1,5 +1,5 @@
 <!--
-    Candy Clicker ver. 1.1.0
+    Candy Clicker ver. 1.1.1
     Copyright © 2021-2022  Ptolemy Hill
 -->
 <Window x:Name="windowCandyClicker" x:Class="CandyClicker.MainWindow"
@@ -19,7 +19,7 @@
         <TextBlock x:Name="textBlockPerSecond" Text="{Binding CandyPerSecond, ElementName=windowCandyClicker, FallbackValue=+X\,XXX/s, StringFormat=+\{0:N0\}/s, TargetNullValue=0}" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="5,50,10,5" FontSize="18" FontWeight="Bold" Foreground="{DynamicResource MainForeground}" FontFamily="{StaticResource mikachan}"/>
         <TextBlock x:Name="textBlockReincarnated" Text="{Binding CandyPSReincarnationMultiplier, ElementName=windowCandyClicker, FallbackValue=(xXX/s), StringFormat=(x\{0:N0\}/s), TargetNullValue=1}" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,73,10,0" FontSize="18" FontWeight="Bold" Foreground="{DynamicResource MainForeground}" FontFamily="{StaticResource mikachan}" Visibility="Hidden" TextAlignment="Center"/>
         <TextBlock x:Name="textBlockClicksPerSecond" Text="0.0 CPS" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,73,0,0" FontSize="18" FontWeight="Bold" Foreground="{DynamicResource MainForeground}" FontFamily="{StaticResource mikachan}"/>
-        <RichTextBox x:Name="richTextBoxCandiesPerSecond" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,50,0,0" FontSize="18" FontWeight="Bold" Foreground="{DynamicResource MainForeground}" FontFamily="{StaticResource mikachan}" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" SelectionTextBrush="{x:Null}"  IsReadOnly="True" IsUndoEnabled="False" AutoWordSelection="False" AcceptsReturn="False">
+        <RichTextBox x:Name="richTextBoxCandiesPerSecond" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,50,0,0" FontSize="18" FontWeight="Bold" Foreground="{DynamicResource MainForeground}" FontFamily="{StaticResource mikachan}" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" SelectionTextBrush="{x:Null}"  IsReadOnly="True" IsUndoEnabled="False" AutoWordSelection="False" AcceptsReturn="False" Cursor="Arrow">
             <FlowDocument x:Name="flowDocumentCandiesPerSecond">
                 <Paragraph x:Name="paragraphCandiesPerSecond" TextAlignment="Center">
                     <Run x:Name="runCandiesPerSecond" Text="0"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 8f309f0..dadc39e 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,5 +1,5 @@
 /*
- * Candy Clicker ver. 1.1.0
+ * Candy Clicker ver. 1.1.1
  * Copyright © 2021-2022  Ptolemy Hill
  */
 using System;
diff --git a/Shop.cs b/Shop.cs
index 4f1b437..407c0df 100644
--- a/Shop.cs
+++ b/Shop.cs
@@ -1,5 +1,5 @@
 /*
- * Candy Clicker ver. 1.1.0
+ * Candy Clicker ver. 1.1.1
  * Copyright © 2021-2022  Ptolemy Hill
  */
 namespace CandyClicker
diff --git a/ShopControl.xaml b/ShopControl.xaml
index 8d30bb2..8fb692e 100644
--- a/ShopControl.xaml
+++ b/ShopControl.xaml
@@ -1,5 +1,5 @@
 <!--
-    Candy Clicker ver. 1.1.0
+    Candy Clicker ver. 1.1.1
     Copyright © 2021-2022  Ptolemy Hill
 -->
 <UserControl x:Name="userControlShopItem" x:Class="CandyClicker.ShopControl"
diff --git a/ShopControl.xaml.cs b/ShopControl.xaml.cs
index 5883960..b9bd9a6 100644
--- a/ShopControl.xaml.cs
+++ b/ShopControl.xaml.cs
@@ -1,5 +1,5 @@
 /*
- * Candy Clicker ver. 1.1.0
+ * Candy Clicker ver. 1.1.1
  * Copyright © 2021-2022  Ptolemy Hill
  */
 using System;