Skip to content

Commit f6b7c48

Browse files
committed
add 32x32 and 16x16 preview images
1 parent 57c6286 commit f6b7c48

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

PixelArtTool/MainWindow.xaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@
9595
<Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="256" Margin="89,50,0,0" VerticalAlignment="Top" Width="256">
9696
<Image x:Name="imgOutline" IsHitTestVisible="False" HorizontalAlignment="Left" Height="256" Margin="-1" VerticalAlignment="Top" Width="256" Stretch="Fill" IsEnabled="False"/>
9797
</Border>
98+
<Rectangle x:Name="recPreviewBg2x" Fill="Black" HorizontalAlignment="Left" Height="32" Margin="375,50,0,0" VerticalAlignment="Top" Width="32"/>
99+
<Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="32" Margin="375,50,0,0" VerticalAlignment="Top" Width="32">
100+
<Image x:Name="imgPreview2x" HorizontalAlignment="Left" Height="32" Margin="-1" VerticalAlignment="Top" Width="32" Stretch="Fill"/>
101+
</Border>
102+
<Rectangle x:Name="recPreviewBg1x" Fill="Black" HorizontalAlignment="Left" Height="16" Margin="425,50,0,0" VerticalAlignment="Top" Width="16"/>
103+
<Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="16" Margin="425,50,0,0" VerticalAlignment="Top" Width="16">
104+
<Image x:Name="imgPreview1x" HorizontalAlignment="Left" Height="16" Margin="-1" VerticalAlignment="Top" Width="16" Stretch="Fill"/>
105+
</Border>
98106
<Button x:Name="btnScrollUp" Click="OnScrollButtonUpClicked" Content="/\" HorizontalAlignment="Left" Margin="388,252,0,0" VerticalAlignment="Top" Width="24"/>
99107
<Button x:Name="btnScrollDown" Click="OnScrollButtonDownClicked" Content="\/" HorizontalAlignment="Left" Margin="388,274,0,0" VerticalAlignment="Top" Width="24"/>
100108
<Button x:Name="btnScrollLeft" Click="OnScrollButtonLeftClicked" Content="&lt;" HorizontalAlignment="Left" Margin="361,263,0,0" VerticalAlignment="Top" Width="24"/>

PixelArtTool/MainWindow.xaml.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ void Start()
119119
outlineBitmap = new WriteableBitmap(canvasResolutionX, canvasResolutionY, dpiX, dpiY, PixelFormats.Bgra32, null);
120120
outlineImage.Source = outlineBitmap;
121121

122-
123122
// build drawing area
124123
drawingImage = imgCanvas;
125124
RenderOptions.SetBitmapScalingMode(drawingImage, BitmapScalingMode.NearestNeighbor);
@@ -129,6 +128,12 @@ void Start()
129128
canvasBitmap = new WriteableBitmap(canvasResolutionX, canvasResolutionY, dpiX, dpiY, PixelFormats.Bgra32, null);
130129
drawingImage.Source = canvasBitmap;
131130

131+
// setup preview area
132+
RenderOptions.SetBitmapScalingMode(imgPreview1x, BitmapScalingMode.NearestNeighbor);
133+
imgPreview1x.Source = canvasBitmap;
134+
RenderOptions.SetBitmapScalingMode(imgPreview2x, BitmapScalingMode.NearestNeighbor);
135+
imgPreview2x.Source = canvasBitmap;
136+
132137
// drawing events
133138
drawingImage.MouseMove += new MouseEventHandler(DrawingAreaMouseMoved);
134139
drawingImage.MouseLeftButtonDown += new MouseButtonEventHandler(DrawingLeftButtonDown);
@@ -499,7 +504,11 @@ void DrawingLeftButtonDown(object sender, MouseButtonEventArgs e)
499504
{
500505
// undo test
501506
undoBufferBitmap[currentUndoIndex++] = canvasBitmap.Clone();
502-
//Console.WriteLine("save undo " + currentUndoIndex);
507+
508+
// FIXME if undobuffer enabled above, sometimes Exception thrown: 'System.IndexOutOfRangeException' in PixelArtTool.exe
509+
// An unhandled exception of type 'System.IndexOutOfRangeException' occurred in PixelArtTool.exe
510+
// Index was outside the bounds of the array.
511+
// Console.WriteLine(drawingImage);
503512

504513
int x = (int)(e.GetPosition(drawingImage).X / canvasScaleX);
505514
int y = (int)(e.GetPosition(drawingImage).Y / canvasScaleX);

0 commit comments

Comments
 (0)