add non-contiguous fill (with left ctrl down while fill), add PixelColor compare operators

Author: unitycoder

PixelArtTool/EnumsAndStructs.cs

@@ -61,7 +61,18 @@ public PixelColor Inverted(byte alphaOverride=255)
             pc.Alpha = alphaOverride;
             return pc;
         }
-    }
+
+        public static bool operator ==(PixelColor c1, PixelColor c2)
+        {
+            return c1.ColorBGRA == c2.ColorBGRA;
+        }
+
+        public static bool operator !=(PixelColor c1, PixelColor c2)
+        {
+            return c1.ColorBGRA != c2.ColorBGRA;
+        }
+
+    } // PixelColor
 
     // helper for converting bool<>enum for xaml linked values
     // https://stackoverflow.com/a/2908885/5452781

PixelArtTool/MainWindow.xaml.cs

@@ -55,8 +55,11 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         int prevX;
         int prevY;
 
-        // drawing lines
         bool leftShiftDown = false;
+        bool leftCtrlDown = false;
+
+
+        // drawing lines
         private readonly int ddaMODIFIER_X = 0x7fff;
         private readonly int ddaMODIFIER_Y = 0x7fff;
 
@@ -453,7 +456,7 @@ void DrawingLeftButtonDown(object sender, MouseButtonEventArgs e)
                     }
                     break;
                 case ToolMode.Fill:
-                    // NOTE: doesnt work with single pixel area.. because nothing to fill
+                    // NOTE: double click doesnt work with single pixel area.. because nothing to fill
                     if (wasDoubleClick == true)
                     {
                         // remove previous pixel by using old color (could take from undo also..)
@@ -466,10 +469,18 @@ void DrawingLeftButtonDown(object sender, MouseButtonEventArgs e)
                         currentColor = previousColor;
                     }
 
-                    FloodFill(x, y, (int)currentColor.ColorBGRA);
-                    if (chkMirrorX.IsChecked == true)
+                    // non-contiguous fill, fills all pixels that match target pixel color
+                    if (leftCtrlDown == true)
                     {
-                        FloodFill(canvasResolutionX - x, y, (int)currentColor.ColorBGRA);
+                        ReplacePixels(previousPixelColor, currentColor);
+                    }
+                    else
+                    {
+                        FloodFill(x, y, (int)currentColor.ColorBGRA);
+                        if (chkMirrorX.IsChecked == true)
+                        {
+                            FloodFill(canvasResolutionX - x, y, (int)currentColor.ColorBGRA);
+                        }
                     }
                     break;
                 default:
@@ -718,6 +729,9 @@ void OnKeyDown(object sender, KeyEventArgs e)
                     lblToolInfo.Content = "Straight Lines";
                     leftShiftDown = true;
                     break;
+                case Key.LeftCtrl: // left control
+                    leftCtrlDown = true;
+                    break;
                 default:
                     break;
             }
@@ -731,6 +745,9 @@ private void OnKeyUp(object sender, KeyEventArgs e)
                     lblToolInfo.Content = "";
                     leftShiftDown = false;
                     break;
+                case Key.LeftCtrl:
+                    leftCtrlDown = false;
+                    break;
                 default:
                     break;
             }
@@ -910,6 +927,8 @@ void OnCopyImageToClipboard()
             */
         }
 
+
+
         void FloodFill(int x, int y, int fillColor)
         {
             // get hit color pixel
@@ -1167,7 +1186,7 @@ private void rectHueBar_MouseDown(object sender, MouseButtonEventArgs e)
 
         private void OnGetTransparentColorButton(object sender, MouseButtonEventArgs e)
         {
-            var c = new PixelColor(255,255,255,0);
+            var c = new PixelColor(255, 255, 255, 0);
             currentColor = c;
             rectCurrentColor.Fill = c.AsSolidColorBrush();
             ResetCurrentBrightnessPreview(currentColor);
@@ -1410,5 +1429,25 @@ private void OnClearButton(object sender, MouseButtonEventArgs e)
             }
 
         }
+
+        public void ReplacePixels(PixelColor find, PixelColor replace)
+        {
+            for (int x = 0; x < canvasResolutionX; x++)
+            {
+                for (int y = 0; y < canvasResolutionY; y++)
+                {
+                    var pixel = GetPixelColor(x, y, canvasBitmap);
+
+                    if (pixel == find)
+                    {
+                        SetPixel(outlineBitmap, x, y, (int)replace.ColorBGRA);
+                    }
+
+                }
+            }
+
+        }
+
+
     } // class
 } // namespace