add color picker dialog for main and secondary color, remove borders from color picker dialog, adding secondary eraser color box, PixelColor from SolidColorBrush

Author: unitycoder

PixelArtTool/ColorPicker.xaml

@@ -43,9 +43,9 @@
 
 	</Window.Resources>
 	<Grid>
-		<Rectangle x:Name="tempRect" Width="200" Height="200" Margin="58,24,0,0" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" UseLayoutRounding="False" Fill="Black" />
-		<Rectangle x:Name="rectSaturation"  Fill="{StaticResource LevelSaturationBrush}" Width="200" Height="200" Margin="58,24,0,0" StrokeThickness="1" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" MouseMove="OnLevelSaturationMouseMoved" MouseDown="OnLevelSaturationMouseDown"  />
-		<Rectangle x:Name="rectHueBar" Fill="{StaticResource HueBrush}" Width="20" Height="200" Margin="263,24,0,0" Stroke="Black" StrokeThickness="1" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" MouseMove="OnHueRectangleMouseMoved" MouseDown="rectHueBar_MouseDown"  />
+		<Rectangle x:Name="tempRect" Width="200" Height="200" Margin="58,24,0,0" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" UseLayoutRounding="False" Fill="Black" StrokeThickness="0" />
+		<Rectangle x:Name="rectSaturation"  Fill="{StaticResource LevelSaturationBrush}" Width="200" Height="200" Margin="58,24,0,0" StrokeThickness="0" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" MouseMove="OnLevelSaturationMouseMoved" MouseDown="OnLevelSaturationMouseDown"  />
+		<Rectangle x:Name="rectHueBar" Fill="{StaticResource HueBrush}" Width="20" Height="200" Margin="263,24,0,0" Stroke="Black" StrokeThickness="0" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" MouseMove="OnHueRectangleMouseMoved" MouseDown="rectHueBar_MouseDown"  />
 		<Rectangle x:Name="rectCurrentColor" Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="28" Margin="10,196,0,0" Stroke="Black" VerticalAlignment="Top" Width="28"/>
 		<Button x:Name="okButton" IsDefault="True" Content="OK" Click="OnOkButtonClick" Margin="258,233,5,4"/>
 		<Button x:Name="cancelButton" IsCancel="True" Content="Cancel" Margin="178,233,85,4"/>

PixelArtTool/EnumsAndStructs.cs

@@ -49,6 +49,15 @@ public PixelColor(byte r, byte g, byte b, byte a)
             Alpha = a;
         }
 
+        public PixelColor(SolidColorBrush b)
+        {
+            ColorBGRA = (UInt32)(b.Color.B + (b.Color.G << 8) + (b.Color.R << 16) + (b.Color.A << 24));
+            Red = b.Color.R;
+            Green = b.Color.G;
+            Blue = b.Color.B;
+            Alpha = b.Color.A;
+        }
+
         public SolidColorBrush AsSolidColorBrush()
         {
             return new SolidColorBrush(Color.FromArgb(Alpha, Red, Green, Blue));

PixelArtTool/MainWindow.xaml

@@ -214,9 +214,9 @@
 			<Button x:Name="btnLoadPalette" Click="OnLoadPaletteButton" Content="Load Palette" HorizontalAlignment="Left" Margin="9,329,0,0" VerticalAlignment="Top" Width="71"/>
 		</Grid>
 		<CheckBox x:Name="chkOutline" Content="Outline" HorizontalAlignment="Left" Margin="638,50,0,0" VerticalAlignment="Top" Width="64" Click="chkOutline_Click"/>
-		<Rectangle x:Name="rectCurrentColor" Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="28" Margin="10,256,0,0" Stroke="Black" VerticalAlignment="Top" Width="28"/>
+		<Rectangle x:Name="rectCurrentColor" Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="28" Margin="10,256,0,0" Stroke="Black" VerticalAlignment="Top" Width="28" MouseDown="rectCurrentColor_MouseDown"/>
 		<CheckBox x:Name="chkMirrorX" Content="Symmetry X" HorizontalAlignment="Left" Margin="638,71,0,0" VerticalAlignment="Top" Width="93" Unchecked="chkMirrorX_Unchecked" Checked="chkMirrorX_Checked"/>
-		<Rectangle x:Name="rectSecondaryColor" Fill="Black" HorizontalAlignment="Left" Height="28" Margin="47,256,0,0" Stroke="Black" VerticalAlignment="Top" Width="28"/>
+		<Rectangle x:Name="rectSecondaryColor" Fill="Black" HorizontalAlignment="Left" Height="28" Margin="47,256,0,0" Stroke="Black" VerticalAlignment="Top" Width="28" MouseDown="rectSecondaryColor_MouseDown"/>
 
 		<!-- https://stackoverflow.com/a/32514853/5452781 -->
 		<Rectangle x:Name="tempRect" Width="200" Height="200" Margin="459,130,0,0" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" UseLayoutRounding="False" Fill="Black" />
@@ -240,6 +240,8 @@
 				<ImageBrush ImageSource="Resources/Images/transparentbg.png"/>
 			</Rectangle.Fill>
 		</Rectangle>
+		<Rectangle x:Name="rectGetTransparentSecondary" HorizontalAlignment="Left" Height="28" Margin="47,289,0,0" Stroke="Black" VerticalAlignment="Top" Width="28" Fill="Black" />
+
 		<Rectangle x:Name="rectPixelPos" IsHitTestVisible="False" HorizontalAlignment="Left" VerticalAlignment="Top" Height="16" Stroke="Black" Width="16" Margin="89,50,0,0"/>
 		<Button x:Name="btnSettings" Content="Settings" HorizontalAlignment="Left" Margin="674,6,0,0" VerticalAlignment="Top" Width="50" Click="btnSettings_Click"/>
 

PixelArtTool/MainWindow.xaml.cs

@@ -10,6 +10,7 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
 using static PixelArtTool.Tools;
 
 namespace PixelArtTool
@@ -1449,6 +1450,37 @@ public void ReplacePixels(PixelColor find, PixelColor replace)
 
         }
 
+        // current color box
+        private void rectCurrentColor_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var newcolor = PalettePicker();
+            if (newcolor != null)
+            {
+                ((Rectangle)sender).Fill = newcolor;
+                currentColor = new PixelColor((SolidColorBrush)newcolor);
+            }
+        }
 
+        // TODO: take current color as param to return if cancelled?
+        Brush PalettePicker()
+        {
+            var dlg = new ColorPicker();
+            dlg.Owner = this;
+            var result = dlg.ShowDialog();
+            if (result == true)
+            {
+                return dlg.rectCurrentColor.Fill;
+            }
+            return null;
+        }
+
+        private void rectSecondaryColor_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var newcolor = PalettePicker();
+            if (newcolor != null)
+            {
+                ((Rectangle)sender).Fill = newcolor;
+            }
+        }
     } // class
 } // namespace