From 8b8e11cdb9ec0cdb33575b2a40c3d96a962b5973 Mon Sep 17 00:00:00 2001
From: VladiStep <vlad2001.21@mail.ru>
Date: Wed, 25 May 2022 18:23:00 +0300
Subject: [PATCH 1/4] Improved sprite texture entries deleting

---
 .../Controls/UndertaleObjectReference.xaml    |  9 +++++---
 .../Controls/UndertaleObjectReference.xaml.cs |  9 ++++++++
 .../Editors/UndertaleSpriteEditor.xaml        | 10 +++++++--
 .../Editors/UndertaleSpriteEditor.xaml.cs     | 22 +++++++++++++++++++
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/UndertaleModTool/Controls/UndertaleObjectReference.xaml b/UndertaleModTool/Controls/UndertaleObjectReference.xaml
index 1a0653ef9..9e049d05d 100644
--- a/UndertaleModTool/Controls/UndertaleObjectReference.xaml
+++ b/UndertaleModTool/Controls/UndertaleObjectReference.xaml
@@ -12,8 +12,11 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
-        <TextBox Grid.Column="0" IsReadOnly="True" Cursor="Arrow" ToolTip="This is an object reference. Drag and drop an object of matching type from the tree on the left to change it!" AllowDrop="True" PreviewDragOver="TextBox_DragOver" PreviewDrop="TextBox_Drop" PreviewMouseDoubleClick="TextBox_MouseDoubleClick" Text="{Binding ObjectReference, RelativeSource={RelativeSource AncestorType=UserControl}}"/>
-        <Button Grid.Column="1" Click="Details_Click">
+        <TextBox Grid.Column="0" Name="ObjectText" IsReadOnly="True" Cursor="Arrow" AllowDrop="True"
+                 ToolTip="This is an object reference. Drag and drop an object of matching type from the tree on the left to change it!"
+                 PreviewDragOver="TextBox_DragOver" PreviewDrop="TextBox_Drop" PreviewMouseDoubleClick="TextBox_MouseDoubleClick"
+                 Text="{Binding ObjectReference, RelativeSource={RelativeSource AncestorType=UserControl}}"/>
+        <Button Grid.Column="1" Name="DetailsButton" Click="Details_Click">
             <Button.Style>
                 <Style TargetType="{x:Type Button}">
                     <Setter Property="Content" Value=" ... " />
@@ -36,7 +39,7 @@
                 </Style>
             </Button.Style>
         </Button>
-        <Button Grid.Column="2" Click="Remove_Click" Content=" X " ToolTip="Remove reference">
+        <Button Grid.Column="2" Name="RemoveButton" Click="Remove_Click" Content=" X " ToolTip="Remove reference">
             <Button.Style>
                 <Style TargetType="{x:Type Button}">
                     <Style.Triggers>
diff --git a/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs b/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs
index cb615c591..f63472572 100644
--- a/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs
+++ b/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs
@@ -91,6 +91,15 @@ public UndertaleObjectReference()
             InitializeComponent();
         }
 
+        public void ClearRemoveClickHandler()
+        {
+            try
+            {
+                RemoveButton.Click -= Remove_Click;
+            }
+            catch { }
+        }
+
         private void Details_Click(object sender, RoutedEventArgs e)
         {
             if (ObjectReference is null)
diff --git a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml
index 2c57c3e35..1f610530b 100644
--- a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml
+++ b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml
@@ -105,7 +105,10 @@
         </Grid>
 
         <TextBlock Grid.Row="10" Grid.Column="0" Margin="3">Textures</TextBlock>
-        <DataGrid Grid.Row="10" Grid.Column="1" Margin="3" ItemsSource="{Binding Textures, Mode=OneWay}" Name="TextureList" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" HorizontalGridLinesBrush="LightGray" VerticalGridLinesBrush="LightGray" HeadersVisibility="None" SelectionMode="Single" SelectionUnit="FullRow" IsSynchronizedWithCurrentItem="True">
+        <DataGrid Grid.Row="10" Grid.Column="1" Margin="3" ItemsSource="{Binding Textures, Mode=OneWay}" Name="TextureList"
+                  AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True"
+                  HorizontalGridLinesBrush="LightGray" VerticalGridLinesBrush="LightGray"
+                  HeadersVisibility="None" SelectionMode="Single" SelectionUnit="FullRow" IsSynchronizedWithCurrentItem="True">
             <DataGrid.Resources>
                 <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#FF26A0DA"/>
                 <Style TargetType="{x:Type DataGridCell}">
@@ -135,7 +138,10 @@
                 <DataGridTemplateColumn Width="*">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <local:UndertaleObjectReference Margin="20,0,0,0" ObjectReference="{Binding Texture, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ObjectType="{x:Type undertale:UndertaleTexturePageItem}" CanRemove="False"/>
+                            <local:UndertaleObjectReference Margin="20,0,0,0" CanRemove="True"
+                                                            Loaded="UndertaleObjectReference_Loaded"
+                                                            ObjectReference="{Binding Texture, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                            ObjectType="{x:Type undertale:UndertaleTexturePageItem}"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
diff --git a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs
index 3bab29117..7a0a0bb7d 100644
--- a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs
+++ b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs
@@ -193,5 +193,27 @@ private void MaskExport_Click(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        private void UndertaleObjectReference_Loaded(object sender, RoutedEventArgs e)
+        {
+            var objRef = sender as UndertaleObjectReference;
+
+            objRef.ClearRemoveClickHandler();
+            objRef.RemoveButton.Click += Remove_Click_Override;
+            objRef.RemoveButton.ToolTip = "Remove texture entry";
+            objRef.RemoveButton.IsEnabled = true;
+            objRef.DetailsButton.ToolTip = "Open texture entry";
+            objRef.ObjectText.PreviewKeyDown += ObjectText_PreviewKeyDown;
+        }
+        private void ObjectText_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Delete)
+                Remove_Click_Override(sender, null);
+        }
+        private void Remove_Click_Override(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is UndertaleSprite spr && (sender as FrameworkElement).DataContext is UndertaleSprite.TextureEntry entry)
+                spr.Textures.Remove(entry);
+        }
     }
 }

From e797cdad29171f7dbfc9b355eb8d3c55f0e5e9f6 Mon Sep 17 00:00:00 2001
From: VladiStep <vlad2001.21@mail.ru>
Date: Wed, 25 May 2022 18:56:14 +0300
Subject: [PATCH 2/4] Removed unnecessary "try-catch"

---
 UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs b/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs
index f63472572..11e654c1d 100644
--- a/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs
+++ b/UndertaleModTool/Controls/UndertaleObjectReference.xaml.cs
@@ -93,11 +93,7 @@ public UndertaleObjectReference()
 
         public void ClearRemoveClickHandler()
         {
-            try
-            {
-                RemoveButton.Click -= Remove_Click;
-            }
-            catch { }
+            RemoveButton.Click -= Remove_Click;
         }
 
         private void Details_Click(object sender, RoutedEventArgs e)

From d0426d38e6faed81ca6d1b222d9d18b3bc0d3b93 Mon Sep 17 00:00:00 2001
From: VladiStep <vlad2001.21@mail.ru>
Date: Wed, 25 May 2022 19:00:24 +0300
Subject: [PATCH 3/4] Fixed "UndertaleTexturePageItemDisplay" that showed last
 non-null texture

---
 .../Controls/UndertaleTexturePageItemDisplay.xaml             | 4 ++--
 .../Controls/UndertaleTexturePageItemDisplay.xaml.cs          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml b/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml
index 116b5ef97..02f3a9984 100644
--- a/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml
+++ b/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml
@@ -1,4 +1,4 @@
-<local:DataUserControl x:Class="UndertaleModTool.UndertaleTexturePageItemDisplay"
+<UserControl x:Class="UndertaleModTool.UndertaleTexturePageItemDisplay"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -21,4 +21,4 @@
             </Border.Background>
         </Border>
     </Canvas>
-</local:DataUserControl>
+</UserControl>
diff --git a/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml.cs b/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml.cs
index 9e9a44cf1..bf28a82bc 100644
--- a/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml.cs
+++ b/UndertaleModTool/Controls/UndertaleTexturePageItemDisplay.xaml.cs
@@ -20,7 +20,7 @@ namespace UndertaleModTool
     /// <summary>
     /// Logika interakcji dla klasy UndertaleTexturePageItemDisplay.xaml
     /// </summary>
-    public partial class UndertaleTexturePageItemDisplay : DataUserControl
+    public partial class UndertaleTexturePageItemDisplay : UserControl
     {
         public UndertaleTexturePageItemDisplay()
         {

From 1a5568dcd555bc549a4b88d033fd9ad54bd545d0 Mon Sep 17 00:00:00 2001
From: VladiStep <vlad2001.21@mail.ru>
Date: Wed, 25 May 2022 19:53:52 +0300
Subject: [PATCH 4/4] Addressed @Miepee comment

Co-authored-by: Miepee <38186597+Miepee@users.noreply.github.com>
---
 UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs
index 7a0a0bb7d..83049ddff 100644
--- a/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs
+++ b/UndertaleModTool/Editors/UndertaleSpriteEditor.xaml.cs
@@ -212,8 +212,8 @@ private void ObjectText_PreviewKeyDown(object sender, KeyEventArgs e)
         }
         private void Remove_Click_Override(object sender, RoutedEventArgs e)
         {
-            if (DataContext is UndertaleSprite spr && (sender as FrameworkElement).DataContext is UndertaleSprite.TextureEntry entry)
-                spr.Textures.Remove(entry);
+            if (DataContext is UndertaleSprite sprite && (sender as FrameworkElement).DataContext is UndertaleSprite.TextureEntry entry)
+                sprite.Textures.Remove(entry);
         }
     }
 }