From 53c8a435a3cecdb9fe908640e76e830c6a88505d Mon Sep 17 00:00:00 2001
From: lars <l.rook2002@hotmail.nl>
Date: Thu, 15 Oct 2020 21:36:06 +0200
Subject: [PATCH] [ADDED]  made a color picker for the canvas

---
 Client/Client.csproj            |  1 +
 Client/Views/GameWindow.xaml    | 21 +++++++++------------
 Client/Views/GameWindow.xaml.cs | 27 +++++++++++++++++++++++++--
 Server/Server.csproj            |  1 +
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/Client/Client.csproj b/Client/Client.csproj
index d66b4aa..d5b88aa 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
diff --git a/Client/Views/GameWindow.xaml b/Client/Views/GameWindow.xaml
index cbc7879..28578fa 100644
--- a/Client/Views/GameWindow.xaml
+++ b/Client/Views/GameWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Client.Views"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
         Title="Scrubl.io" Height="600" Width="1200">
     <Grid>
@@ -11,7 +12,7 @@
             <RowDefinition Height="50"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        
+
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="200"/>
             <ColumnDefinition/>
@@ -29,23 +30,19 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <Label Grid.Row="0" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="1" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="2" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="3" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="4" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="5" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="6" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="7" Content="{Binding Path=...}" FontSize="15"/>
+
 
         </Grid>
 
-        <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Width="100" Margin="10, 10, 10, 10" Content="RESET" />
-        <Canvas Name="CanvasForPaint" Grid.Row="1" Grid.Column="1" MouseDown="CanvasForPaint_MouseDown" MouseMove="CanvasForPaint_MouseMove" Margin="10, 10, 10, 10">
+        <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="1" Margin="890,10,10,10" Content="RESET" />
+
+        <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center"></xctk:ColorPicker>
+
+        <Canvas Name="CanvasForPaint" Grid.Row="1" Grid.Column="1" MouseDown="CanvasForPaint_MouseDown" MouseMove="CanvasForPaint_MouseMove" Margin="10, 10, 10, 10" >
             <Canvas.Background>
                 <SolidColorBrush Color="White" Opacity="0"/>
             </Canvas.Background>
         </Canvas>
-        
+
     </Grid>
 </Window>
diff --git a/Client/Views/GameWindow.xaml.cs b/Client/Views/GameWindow.xaml.cs
index 641e3e4..ac9b36c 100644
--- a/Client/Views/GameWindow.xaml.cs
+++ b/Client/Views/GameWindow.xaml.cs
@@ -40,7 +40,9 @@ namespace Client.Views
             {
                 Line line = new Line();
 
-                line.Stroke = SystemColors.WindowFrameBrush;
+                
+                line.Stroke = new SolidColorBrush(color);
+                //line.Stroke = SystemColors.WindowFrameBrush;
                 line.X1 = currentPoint.X;
                 line.Y1 = currentPoint.Y;
                 line.X2 = e.GetPosition(CanvasForPaint).X;
@@ -53,11 +55,22 @@ namespace Client.Views
 
         }
 
+        private Color color;
+
+        private void ClrPcker_Background_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color> e)
+        {
+            Color colorSelected = new Color();
+            colorSelected.A = 255;
+            colorSelected.R = ClrPcker_Background.SelectedColor.Value.R;
+            colorSelected.G = ClrPcker_Background.SelectedColor.Value.G;
+            colorSelected.B = ClrPcker_Background.SelectedColor.Value.B;
+            color = colorSelected;
+        }
+
         private void CanvasReset_Click(object sender, RoutedEventArgs e)
         {
             CanvasForPaint.Children.Clear();
 
-
             //FOR FUTURE USE, IF NECCESSARY
             //TEST.Children.Clear();
 
@@ -69,5 +82,15 @@ namespace Client.Views
             //}
 
         }
+
+        private void ClrPcker_Background_SelectedColorChanged_1(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            Color colorSelected = new Color();
+            colorSelected.A = 255;
+            colorSelected.R = ClrPcker_Background.SelectedColor.Value.R;
+            colorSelected.G = ClrPcker_Background.SelectedColor.Value.G;
+            colorSelected.B = ClrPcker_Background.SelectedColor.Value.B;
+            color = colorSelected;
+        }
     }
 }
diff --git a/Server/Server.csproj b/Server/Server.csproj
index 4774318..65a6e4e 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AsyncAwaitBestPractices" Version="4.3.0" />
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />