add undo/redo icons, allow mousedrag on saturation and hue rectangle color pickers, add temporary app icon, add ctrl+shift+s (save as), add ctrl+n (new image), add pixel position preview rectangle

Author: unitycoder

PixelArtTool/MainWindow.xaml

@@ -6,18 +6,22 @@
         xmlns:local="clr-namespace:PixelArtTool"
         xmlns:System="clr-namespace:System;assembly=mscorlib" x:Name="window" x:Class="PixelArtTool.MainWindow"
         mc:Ignorable="d"
-        Title="PixelArtTool (Test Version)" Height="412.222" Width="739.444" Background="#FF252526" KeyDown="OnKeyDown" KeyUp="OnKeyUp">
+        Title="PixelArtTool (Test Version)" Height="412.222" Width="739.444" Background="#FF252526" KeyDown="OnKeyDown" KeyUp="OnKeyUp" Icon="Resources/Icons/appicon.ico">
 	<Window.CommandBindings>
 		<CommandBinding Command="ApplicationCommands.Undo" Executed="Executed_Undo" CanExecute="CanExecute_Undo"/>
 		<CommandBinding Command="ApplicationCommands.Redo" Executed="Executed_Redo" CanExecute="CanExecute_Redo"/>
 		<CommandBinding Command="ApplicationCommands.Paste" Executed="Executed_Paste" CanExecute="CanExecute_Paste"/>
 		<CommandBinding Command="ApplicationCommands.Copy" Executed="Executed_Copy" CanExecute="CanExecute_Copy"/>
+		<CommandBinding Command="ApplicationCommands.SaveAs" Executed="Executed_SaveAs" CanExecute="CanExecute_SaveAs"/>
+		<CommandBinding Command="ApplicationCommands.New" Executed="Executed_New" CanExecute="CanExecute_New"/>
 	</Window.CommandBindings>
 	<Window.InputBindings>
 		<KeyBinding Command="ApplicationCommands.Undo" Gesture="Ctrl+Z"/>
 		<KeyBinding Command="ApplicationCommands.Redo" Gesture="Ctrl+Y"/>
 		<KeyBinding Command="ApplicationCommands.Paste" Gesture="Ctrl+V"/>
 		<KeyBinding Command="ApplicationCommands.Copy" Gesture="Ctrl+C"/>
+		<KeyBinding Command="ApplicationCommands.SaveAs" Gesture="Ctrl+Shift+S"/>
+		<KeyBinding Command="ApplicationCommands.New" Gesture="Ctrl+N"/>
 	</Window.InputBindings>
 	<Window.Resources>
 
@@ -63,7 +67,7 @@
 
 	</Window.Resources>
 
-	<Grid>
+	<Grid Margin="0,0,-8,-7">
 		<Grid.Resources>
 			<local:EnumBooleanConverter x:Key="ComparisonConverter" />
 
@@ -101,10 +105,10 @@
 
 		<ToolBarTray Background="#FF1F1F1F" Height="32" VerticalAlignment="Top">
 			<ToolBar Band="1" BandIndex="1" VerticalAlignment="Top" Background="#FF9C9C9C">
-				<Button x:Name="btnNew" ToolTip="New (clear image)" Click="OnClearButton">
+				<Button x:Name="btnNew" ToolTip="New (Ctrl+N)" Click="OnClearButton">
 					<Image Source="/Resources/Buttons/newimage.png"  Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor" />
 				</Button>
-				<Button x:Name="btnSave" ToolTip="Save as.." Click="OnSaveButton">
+				<Button x:Name="btnSave" ToolTip="Save as..(Ctrl+Shift+s)" Click="OnSaveButton">
 					<Image Source="/Resources/Buttons/save.png" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor" />
 				</Button>
 			</ToolBar>
@@ -134,11 +138,11 @@
 			</ToolBar>
 
 			<ToolBar Band="1" BandIndex="1" VerticalAlignment="Top" Background="#FF9C9C9C">
-				<Button x:Name="btnUndo" ToolTip="Undo" Click="OnUndoButtonDown">
-					<Image Source="/Resources/Buttons/emptybutton.png" />
+				<Button x:Name="btnUndo" ToolTip="Undo (Ctrl+z)" Click="OnUndoButtonDown">
+					<Image Source="/Resources/Buttons/undo.png" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor" />
 				</Button>
-				<Button x:Name="btnRedo" ToolTip="Redo" Click="OnRedoButtonDown">
-					<Image Source="/Resources/Buttons/emptybutton.png" />
+				<Button x:Name="btnRedo" ToolTip="Redo (Ctrl+y)" Click="OnRedoButtonDown">
+					<Image Source="/Resources/Buttons/redo.png" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor" />
 				</Button>
 			</ToolBar>
 
@@ -205,7 +209,7 @@
 			<Button x:Name="btnScrollRight" Click="OnScrollButtonRightClicked" Content="&gt;" HorizontalAlignment="Left" Margin="415,262,0,0" VerticalAlignment="Top" Width="24"/>
 			<Button x:Name="btnFlipX" Click="OnFlipXButtonDown" Content="FlipX" HorizontalAlignment="Left" Margin="365,316,0,0" VerticalAlignment="Top" Width="32"/>
 			<Button x:Name="btnFlipY" Click="OnFlipYButtonDown" Content="FlipY" HorizontalAlignment="Left" Margin="402,316,0,0" VerticalAlignment="Top" Width="32"/>
-			<Button x:Name="btnLoadPalette" Click="OnLoadPaletteButton" Content="Load Palette" HorizontalAlignment="Left" Margin="10,324,0,0" VerticalAlignment="Top" Width="71"/>
+			<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"/>
@@ -214,8 +218,8 @@
 
 		<!-- 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" />
-		<Rectangle x:Name="rectSaturation"  Fill="{StaticResource LevelSaturationBrush}" Width="200" Height="200" Margin="459,130,0,0" StrokeThickness="1" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" MouseDown="OnLevelSaturationMouseDown" />
-		<Rectangle x:Name="rectHueBar" Fill="{StaticResource HueBrush}" Width="20" Height="200" Margin="664,130,0,0" Stroke="Black" StrokeThickness="1" SnapsToDevicePixels="True" MouseDown="rectHueBar_MouseDown" HorizontalAlignment="Left" VerticalAlignment="Top" />
+		<Rectangle x:Name="rectSaturation"  Fill="{StaticResource LevelSaturationBrush}" Width="200" Height="200" Margin="459,130,0,0" StrokeThickness="1" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" MouseDown="OnLevelSaturationMouseDown" MouseMove="OnLevelSaturationMouseMoved" />
+		<Rectangle x:Name="rectHueBar" Fill="{StaticResource HueBrush}" Width="20" Height="200" Margin="664,130,0,0" Stroke="Black" StrokeThickness="1" SnapsToDevicePixels="True" MouseDown="rectHueBar_MouseDown" HorizontalAlignment="Left" VerticalAlignment="Top" MouseMove="OnHueRectangleMouseMoved" />
 		<Grid>
 			<Rectangle x:Name="rectCurrentHue" Width="253" Height="14" Margin="91,316,0,0" Stroke="Black" StrokeThickness="1" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Top" >
 				<Rectangle.Fill>
@@ -234,6 +238,7 @@
 				<ImageBrush ImageSource="Resources/Images/transparentbg.png"/>
 			</Rectangle.Fill>
 		</Rectangle>
+		<Rectangle x:Name="rectPixelPos" IsHitTestVisible="False" HorizontalAlignment="Left" VerticalAlignment="Top" Height="16" Stroke="Black" Width="16" Margin="90,50,0,0"/>
 
 	</Grid>
 </Window>

PixelArtTool/MainWindow.xaml.cs

@@ -591,7 +591,12 @@ void DrawingAreaMouseMoved(object sender, MouseEventArgs e)
                 UpdateOutline();
             }
 
-        }
+            // snap preview rectangle to grid
+            var left = x * canvasScaleX;
+            var top = y * canvasScaleX;
+            rectPixelPos.Margin = new Thickness(89+left, 50+top, 0, 0);
+
+        } // drawingareamousemoved
 
         void ShowMousePos(int x, int y)
         {
@@ -845,6 +850,26 @@ public void CanExecute_Copy(object sender, CanExecuteRoutedEventArgs e)
             e.CanExecute = true;
         }
 
+        public void Executed_SaveAs(object sender, ExecutedRoutedEventArgs e)
+        {
+            OnSaveButton(null, null);
+        }
+
+        public void CanExecute_SaveAs(object sender, CanExecuteRoutedEventArgs e)
+        {
+            e.CanExecute = true;
+        }
+
+        public void Executed_New(object sender, ExecutedRoutedEventArgs e)
+        {
+            OnClearButton(null, null);
+        }
+
+        public void CanExecute_New(object sender, CanExecuteRoutedEventArgs e)
+        {
+            e.CanExecute = true;
+        }
+
         // paste image from clipboard to canvas
         void OnPasteImageFromClipboard()
         {
@@ -1193,20 +1218,7 @@ private void rectHueBar_MouseDown(object sender, MouseButtonEventArgs e)
             rectSaturation.OpacityMask = opacityBrush;
         }
 
-        private void OnLevelSaturationMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            CustomPoint cursor;
-            GetCursorPos(out cursor);
-            var c1 = Win32GetScreenPixel((int)cursor.X, (int)cursor.Y);
-            var c2 = new PixelColor();
-            c2.Alpha = c1.A;
-            c2.Red = c1.R;
-            c2.Green = c1.G;
-            c2.Blue = c1.B;
-            currentColor = c2;
-            rectCurrentColor.Fill = new SolidColorBrush(Color.FromArgb(c2.Alpha, c2.Red, c2.Green, c2.Blue));
-            ResetCurrentBrightnessPreview(currentColor);
-        }
+
 
         private void OnGetTransparentColorButton(object sender, MouseButtonEventArgs e)
         {
@@ -1232,6 +1244,32 @@ private void chkMirrorX_Checked(object sender, RoutedEventArgs e)
             lineSymmetryXpositionB.Visibility = Visibility.Visible;
         }
 
+        private void OnLevelSaturationMouseMoved(object sender, MouseEventArgs e)
+        {
+            if (rectSaturation.IsMouseOver == false) return;
+            if (e.LeftButton == MouseButtonState.Pressed) OnLevelSaturationMouseDown(null, null);
+        }
+
+        private void OnLevelSaturationMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            CustomPoint cursor;
+            GetCursorPos(out cursor);
+            var c1 = Win32GetScreenPixel((int)cursor.X, (int)cursor.Y);
+            var c2 = new PixelColor();
+            c2.Alpha = c1.A;
+            c2.Red = c1.R;
+            c2.Green = c1.G;
+            c2.Blue = c1.B;
+            currentColor = c2;
+            rectCurrentColor.Fill = new SolidColorBrush(Color.FromArgb(c2.Alpha, c2.Red, c2.Green, c2.Blue));
+            ResetCurrentBrightnessPreview(currentColor);
+        }
+
+        private void OnHueRectangleMouseMoved(object sender, MouseEventArgs e)
+        {
+            if (rectHueBar.IsMouseOver == false) return;
+            if (e.LeftButton == MouseButtonState.Pressed) rectHueBar_MouseDown(null, null);
+        }
     } // class
 
 } // namespace

PixelArtTool/PixelArtTool.csproj

@@ -35,6 +35,9 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\Icons\appicon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -118,5 +121,12 @@
   <ItemGroup>
     <Resource Include="Resources\Images\transparentbg.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Buttons\redo.png" />
+    <Resource Include="Resources\Buttons\undo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons\appicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>