Removed Apply and Cancel buttons

src/Level/Entities/Ground.axaml.cs

@@ -1,7 +1,6 @@
 using Kaitai;
 using SMM2SaveEditor.Utility;
 using Avalonia.Controls;
-using System.Collections.Generic;
 using Avalonia.Media.Imaging;
 
 namespace SMM2SaveEditor.Entities
@@ -40,11 +39,7 @@ public void LoadFromStream(KaitaiStream io, Canvas? canvas = null)
             id = io.ReadU1();
             backgroundId = io.ReadU1();
 
-            Canvas.SetLeft(this, x * 160);
-            Canvas.SetBottom(this, y * 160);
-
-            sprite.Source = bitmap;
-            sprite.PointerPressed += (this as IEntity).OnClick;
+            UpdateSprite();
         }
 
         public byte[] GetBytes()
@@ -62,6 +57,11 @@ public byte[] GetBytes()
         public void UpdateSprite()
         {
             // throw new System.NotImplementedException();
+            Canvas.SetLeft(this, x * 160);
+            Canvas.SetBottom(this, y * 160);
+
+            sprite.Source = bitmap;
+            sprite.PointerPressed += (this as IEntity).OnClick;
         }
     }
 }

src/Level/Map.axaml.cs

@@ -47,6 +47,7 @@ public Map()
         {
             InitializeComponent();
             myCanvas = this.Find<Canvas>("MapCanvas");
+            // myCanvas.PointerPressed += (this as IEntity).OnClick;
         }
 
         public void LoadFromStream(KaitaiStream io, Canvas? canvas = null)

src/Utility/EditorHelpers/EntityEditor.axaml

@@ -5,17 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="500"
              x:Class="SMM2SaveEditor.Utility.EditorHelpers.EntityEditor" 
 			 Background="DarkGray">
-	<DockPanel LastChildFill="False">
-		<Grid ColumnDefinitions="*,*" DockPanel.Dock="Bottom">
-			<Button Grid.Column="0" Name="Apply" HorizontalAlignment="Center">
-				<TextBlock Text="Apply" TextAlignment="Center"/>
-			</Button>
-			<Button Grid.Column="1" Name="Cancel" HorizontalAlignment="Center">
-				<TextBlock Text="Cancel" TextAlignment="Center"/>
-			</Button>
-		</Grid>
-		<ScrollViewer HorizontalScrollBarVisibility="Auto">
-			<Grid ColumnDefinitions="*,*" Name="EditorGrid" VerticalAlignment="Top"/>
-		</ScrollViewer>
-	</DockPanel>
+	<ScrollViewer HorizontalScrollBarVisibility="Auto">
+		<Grid ColumnDefinitions="*,*" Name="EditorGrid" VerticalAlignment="Top"/>
+	</ScrollViewer>
 </UserControl>

src/Utility/EditorHelpers/EntityEditor.axaml.cs

@@ -17,33 +17,16 @@ public partial class EntityEditor : UserControl
         private List<string> labels;
         private Grid grid;
 
-        private Button applyButton;
-        private Button cancelButton;
-
         public EntityEditor()
         {
             Instance = this;
             InitializeComponent();
 
             grid = this.Find<Grid>("EditorGrid");
             if (grid == null) throw new Exception("No grid found!");
-
-            applyButton = this.Find<Button>("Apply");
-            if (applyButton == null) throw new Exception("No apply button found!");
-
-            applyButton.Click += OnApply;
-
-            cancelButton = this.Find<Button>("Cancel");
-            if (cancelButton == null) throw new Exception("No cancel button found!");
-
-            cancelButton.Click += delegate
-            {
-                grid.Children.RemoveAll(grid.Children);
-                objRef = null;
-            };
         }
 
-        private void OnApply(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnApply()
         {
             if (labels == null || objRef == null) return;
 
@@ -112,6 +95,7 @@ public void OpenOptions(Point p, IEntity entity)
                 {
                     EnumDropdown enumDropdown = new();
                     enumDropdown.SetEnum(type, kvp.Value);
+                    enumDropdown.SelectionChanged += delegate { OnApply(); };
 
                     o = enumDropdown;
                 } 
@@ -120,6 +104,8 @@ public void OpenOptions(Point p, IEntity entity)
                 {
                     FlagEditor flagEditor = new();
                     flagEditor.SetFlag((uint)kvp.Value);
+                    flagEditor.ValueChanged += delegate { OnApply(); };
+
                     o = flagEditor;
                 }
                 else 
@@ -128,13 +114,16 @@ public void OpenOptions(Point p, IEntity entity)
                     NumericUpDown numericUpDown = new();
                     numericUpDown.Increment = 1;
                     numericUpDown.Value = Convert.ToDecimal(kvp.Value);
+                    numericUpDown.ValueChanged += delegate { OnApply(); };
 
                     o = numericUpDown;
                 }
                 else
                 {
                     TextBox valueBlock = new();
                     valueBlock.Text = kvp.Value.ToString();
+                    valueBlock.TextInput += delegate { OnApply(); };
+
                     o = valueBlock;
                 }
 

src/Utility/EditorHelpers/EnumDropdown.axaml.cs

@@ -12,13 +12,20 @@ public partial class EnumDropdown : UserControl
 
         public object? enumValue;
 
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+
         public EnumDropdown()
         {
             InitializeComponent();
 
             dropdown = this.Find<ComboBox>("Dropdown");
         }
 
+        private void Dropdown_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            SelectionChanged.Invoke(sender, e);
+        }
+
         public void SetEnum<T>(T defaultValue) where T : Enum
         {
             SetEnum(typeof(T), defaultValue);
@@ -35,11 +42,11 @@ public void SetEnum(Type T, object? defaultValue = null)
                 dropdown.Items.Add(item);
             }
 
-            dropdown.SelectionChanged += delegate
+            dropdown.SelectionChanged += (sender, e) =>
             {
                 if (dropdown.SelectedValue is ComboBoxItem item) {
                     enumValue = Enum.Parse(T, item.Content.ToString());
-                    Debug.WriteLine($"New value: {enumValue}");
+                    SelectionChanged.Invoke(sender, e);
                 }
             };
 

src/Utility/EditorHelpers/FlagEditor.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using System.Diagnostics;
 using System.Collections.Generic;
+using System;
 
 namespace SMM2SaveEditor.Utility.EditorHelpers
 {
@@ -15,10 +16,13 @@ public partial class FlagEditor : UserControl
         List<CheckBox> checkedList = new();
 
         TextBox textBox;
-        Button button;
+        Button toggleExpandButton;
 
         bool bIsExpanded = false;
 
+        public delegate void FlagEditorValueChangedHandler(object sender);
+        public event FlagEditorValueChangedHandler ValueChanged;
+
         public FlagEditor()
         {
             InitializeComponent();
@@ -37,8 +41,8 @@ public FlagEditor()
             grid = new();
             SetupGrid();
 
-            button = this.Find<Button>("ToggleExpand");
-            button.Click += Button_Click;
+            toggleExpandButton = this.Find<Button>("ToggleExpand");
+            toggleExpandButton.Click += Button_Click;
         }
 
         public void SetFlag(uint newFlag)
@@ -54,13 +58,13 @@ private void Button_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs
             {
                 textBox.Text = flag.ToString("X");
                 contentControl.Content = textBox;
-                button.Content = "Expand";
+                toggleExpandButton.Content = "Expand";
             } 
             else
             {
                 UpdateGrid();
                 contentControl.Content = scrollViewer;
-                button.Content = "Minimize";
+                toggleExpandButton.Content = "Minimize";
             }
 
             bIsExpanded ^= true;
@@ -76,6 +80,7 @@ private void TextBox_TextChanged(object? sender, TextChangedEventArgs e)
             try
             {
                 flag = uint.Parse(textBox.Text, System.Globalization.NumberStyles.AllowHexSpecifier);
+                ValueChanged.Invoke(this);
             }
             catch
             {
@@ -100,7 +105,7 @@ private void SetupGrid()
                 Grid.SetRow(checkBox, i);
 
                 uint copy = counter;
-                checkBox.Click += delegate { flag ^= copy; };
+                checkBox.Click += delegate { flag ^= copy; ValueChanged.Invoke(this); };
 
                 counter <<= 1;
             }