From 4a7ba0b4a46008f965803d12f12b36160ee78e70 Mon Sep 17 00:00:00 2001
From: VladiStep <vlad2001.21@mail.ru>
Date: Thu, 2 Jun 2022 22:14:26 +0300
Subject: [PATCH 1/2] Fixed QOI textures display on different system display
 scale; embedded texture and texture item preview looks sharp

---
 UndertaleModLib/Util/QoiConverter.cs                         | 1 +
 UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml | 3 ++-
 UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/UndertaleModLib/Util/QoiConverter.cs b/UndertaleModLib/Util/QoiConverter.cs
index 9aeadaf88..369dfee9c 100644
--- a/UndertaleModLib/Util/QoiConverter.cs
+++ b/UndertaleModLib/Util/QoiConverter.cs
@@ -69,6 +69,7 @@ public unsafe static Bitmap GetImageFromSpan(ReadOnlySpan<byte> bytes, out int l
             ReadOnlySpan<byte> pixelData = bytes.Slice(12, length);
 
             Bitmap bmp = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+            bmp.SetResolution(96.0f, 96.0f);
 
             BitmapData data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
             if (data.Stride != width * 4)
diff --git a/UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml b/UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml
index 1a420e640..e08acb4a7 100644
--- a/UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml
+++ b/UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml
@@ -36,7 +36,8 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Viewbox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Stretch="Uniform" StretchDirection="DownOnly">
+            <Viewbox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Stretch="Uniform" StretchDirection="DownOnly"
+                     SnapsToDevicePixels="True" RenderOptions.BitmapScalingMode="NearestNeighbor">
                 <Border>
                     <Border.Background>
                         <DrawingBrush Stretch="None" TileMode="Tile" Viewport="0,0,20,20" ViewportUnits="Absolute">
diff --git a/UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml b/UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml
index 7219db7a0..c5b33abf6 100644
--- a/UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml
+++ b/UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml
@@ -91,7 +91,8 @@
             <Button Grid.Column="3" Content="Export" Click="Export_Click"/>
         </Grid>
 
-        <Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" Stretch="Uniform" StretchDirection="DownOnly">
+        <Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" Stretch="Uniform" StretchDirection="DownOnly"
+                 SnapsToDevicePixels="True" RenderOptions.BitmapScalingMode="NearestNeighbor">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>

From a263f92a7257dc2a3ef226a00e810678f40421f8 Mon Sep 17 00:00:00 2001
From: VladiStep <vlad2001.21@mail.ru>
Date: Fri, 3 Jun 2022 13:40:48 +0300
Subject: [PATCH 2/2] Sprite mask preview uses "nearest neighbor"; fixed
 converter name typo.

---
 UndertaleModTool/Converters/MaskImageConverter.cs   | 2 +-
 UndertaleModTool/Editors/UndertaleSpriteEditor.xaml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UndertaleModTool/Converters/MaskImageConverter.cs b/UndertaleModTool/Converters/MaskImageConverter.cs
index de8d7ec8b..d2dbafc12 100644
--- a/UndertaleModTool/Converters/MaskImageConverter.cs
+++ b/UndertaleModTool/Converters/MaskImageConverter.cs
@@ -11,7 +11,7 @@
 
 namespace UndertaleModTool
 {
-    public class MaskImageConverer : IMultiValueConverter
+    public class MaskImageConverter : IMultiValueConverter
     {
         public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
diff --git a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml
index 1f610530b..c9f724c86 100644
--- a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml
+++ b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml
@@ -210,11 +210,12 @@
                     <StackPanel Name="MaskEditor">
                         <Viewbox Stretch="None">
                             <Border BorderThickness="2" BorderBrush="Gray" Name="MaskBorder">
-                                <Image Stretch="None" Name="MaskImage">
+                                <Image Stretch="None" Name="MaskImage"
+                                       SnapsToDevicePixels="True" RenderOptions.BitmapScalingMode="NearestNeighbor">
                                     <Image.Source>
                                         <MultiBinding>
                                             <MultiBinding.Converter>
-                                                <local:MaskImageConverer/>
+                                                <local:MaskImageConverter/>
                                             </MultiBinding.Converter>
                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Width" Mode="OneWay"/>
                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Height" Mode="OneWay"/>