@@ -44,6 +44,8 @@ public partial class MainWindow : Window, INotifyPropertyChanged
4444
4545 // colors
4646 PixelColor currentColor ;
47+ PixelColor eraseColor = new PixelColor ( 0 , 0 , 0 , 0 ) ;
48+
4749 PixelColor [ ] palette ;
4850 PixelColor lightColor ;
4951 PixelColor darkColor ;
@@ -59,7 +61,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
5961 bool leftShiftDown = false ;
6062 bool leftCtrlDown = false ;
6163
62-
6364 // drawing lines
6465 private readonly int ddaMODIFIER_X = 0x7fff ;
6566 private readonly int ddaMODIFIER_Y = 0x7fff ;
@@ -149,7 +150,7 @@ void Start(bool loadSettings = true)
149150 darkColor . Alpha = gridAlpha ;
150151
151152 // get values from settings
152- if ( loadSettings == true ) LoadSettings ( ) ;
153+ if ( loadSettings == true ) LoadSettings ( ) ;
153154
154155 // setup background grid
155156 gridBitmap = new WriteableBitmap ( canvasResolutionX , canvasResolutionY , dpiX , dpiY , PixelFormats . Bgra32 , null ) ;
@@ -250,12 +251,13 @@ void DrawPixel(int x, int y)
250251
251252 void ErasePixel ( int x , int y )
252253 {
253- byte [ ] ColorData = { 0 , 0 , 0 , 0 } ; // B G R
254+ // byte[] ColorData = { 0, 0, 0, 0 }; // B G R
254255 if ( x < 0 || x > canvasResolutionX - 1 ) return ;
255256 if ( y < 0 || y > canvasResolutionY - 1 ) return ;
256257
257- Int32Rect rect = new Int32Rect ( x , y , 1 , 1 ) ;
258- canvasBitmap . WritePixels ( rect , ColorData , 4 , 0 ) ;
258+ // Int32Rect rect = new Int32Rect(x, y, 1, 1);
259+ // canvasBitmap.WritePixels(rect, ColorData, 4, 0);
260+ SetPixel ( canvasBitmap , x , y , ( int ) eraseColor . ColorBGRA ) ;
259261 }
260262
261263 void PickPalette ( MouseEventArgs e )
@@ -713,12 +715,20 @@ void OnKeyDown(object sender, KeyEventArgs e)
713715 rectCurrentColor . Fill = currentColor . AsSolidColorBrush ( ) ;
714716 break ;
715717 case Key . X : // swap current/secondary colors
716- var tempcolor = rectCurrentColor . Fill ;
717- rectCurrentColor . Fill = rectSecondaryColor . Fill ;
718- rectSecondaryColor . Fill = tempcolor ;
719- // TODO move to converter
720- var t = ( ( SolidColorBrush ) rectCurrentColor . Fill ) . Color ;
721- currentColor = new PixelColor ( t . R , t . G , t . B , t . A ) ;
718+ if ( leftShiftDown == true ) // swap eraser colors
719+ {
720+ var tempcolor = rectEraserColor . Fill ;
721+ rectEraserColor . Fill = rectEraserColorSecondary . Fill ;
722+ rectEraserColorSecondary . Fill = tempcolor ;
723+ eraseColor = new PixelColor ( ( ( SolidColorBrush ) rectEraserColor . Fill ) . Color ) ;
724+ }
725+ else // regular color
726+ {
727+ var tempcolor = rectCurrentColor . Fill ;
728+ rectCurrentColor . Fill = rectSecondaryColor . Fill ;
729+ rectSecondaryColor . Fill = tempcolor ;
730+ currentColor = new PixelColor ( ( ( SolidColorBrush ) rectCurrentColor . Fill ) . Color ) ;
731+ }
722732 break ;
723733 case Key . B : // brush
724734 CurrentTool = ToolMode . Draw ;
@@ -732,6 +742,7 @@ void OnKeyDown(object sender, KeyEventArgs e)
732742 break ;
733743 case Key . LeftCtrl : // left control
734744 leftCtrlDown = true ;
745+ lblCtrlInfo . Content = "Double click to replace target colors" ;
735746 break ;
736747 default :
737748 break ;
@@ -748,6 +759,7 @@ private void OnKeyUp(object sender, KeyEventArgs e)
748759 break ;
749760 case Key . LeftCtrl :
750761 leftCtrlDown = false ;
762+ lblCtrlInfo . Content = "-" ;
751763 break ;
752764 default :
753765 break ;
@@ -1390,7 +1402,7 @@ private void drawingImage_MouseEnter(object sender, MouseEventArgs e)
13901402 private void OnClearButton ( object sender , MouseButtonEventArgs e )
13911403 {
13921404 // shiftdown or right button, just clear without dialog
1393- if ( leftShiftDown == true || ( e != null && e . RightButton == MouseButtonState . Pressed ) )
1405+ if ( leftShiftDown == true || ( e != null && e . RightButton == MouseButtonState . Pressed ) )
13941406 {
13951407 ClearImage ( canvasBitmap , emptyRect , emptyPixels , emptyStride ) ;
13961408 UpdateOutline ( ) ;
@@ -1429,7 +1441,6 @@ private void OnClearButton(object sender, MouseButtonEventArgs e)
14291441 Console . WriteLine ( "Unknown error.." ) ;
14301442 break ;
14311443 }
1432-
14331444 }
14341445
14351446 public void ReplacePixels ( PixelColor find , PixelColor replace )
@@ -1442,12 +1453,10 @@ public void ReplacePixels(PixelColor find, PixelColor replace)
14421453
14431454 if ( pixel == find )
14441455 {
1445- SetPixel ( outlineBitmap , x , y , ( int ) replace . ColorBGRA ) ;
1456+ SetPixel ( canvasBitmap , x , y , ( int ) replace . ColorBGRA ) ;
14461457 }
1447-
14481458 }
14491459 }
1450-
14511460 }
14521461
14531462 // current color box
0 commit comments