Fixed tool action display not updating

PixiEditor/Models/Controllers/BitmapManager.cs

@@ -40,6 +40,8 @@ namespace PixiEditor.Models.Controllers
 
         public event EventHandler<DocumentChangedEventArgs> DocumentChanged;
 
+        public event EventHandler<SelectedToolEventArgs> SelectedToolChanged;
+
         public MouseMovementController MouseController { get; set; }
 
         public Tool SelectedTool
@@ -47,8 +49,11 @@ namespace PixiEditor.Models.Controllers
             get => selectedTool;
             private set
             {
-                selectedTool = value;
-                RaisePropertyChanged("SelectedTool");
+                Tool previousTool = selectedTool;
+                if (SetProperty(ref selectedTool, value))
+                {
+                    SelectedToolChanged?.Invoke(this, new SelectedToolEventArgs(previousTool, value));
+                }
             }
         }
 

PixiEditor/Models/Events/SelectedToolEventArgs.cs

@@ -0,0 +1,22 @@
+using PixiEditor.Models.Tools;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PixiEditor.Models.Events
+{
+    public class SelectedToolEventArgs
+    {
+        public SelectedToolEventArgs(Tool oldTool, Tool newTool)
+        {
+            OldTool = oldTool;
+            NewTool = newTool;
+        }
+
+        public Tool OldTool { get; set; }
+
+        public Tool NewTool { get; set; }
+    }
+}

PixiEditor/ViewModels/ViewModelMain.cs

@@ -230,7 +230,7 @@ namespace PixiEditor.ViewModels
 
             BitmapManager.PrimaryColor = ColorsSubViewModel.PrimaryColor;
 
-            BitmapManager.AddPropertyChangedCallback(nameof(BitmapManager.SelectedTool), () => { if (!OverrideActionDisplay) RaisePropertyChanged(nameof(ActionDisplay)); });
+            BitmapManager.SelectedToolChanged += BitmapManager_SelectedToolChanged;
         }
 
         /// <summary>
@@ -258,6 +258,27 @@ namespace PixiEditor.ViewModels
             ((CancelEventArgs)property).Cancel = !RemoveDocumentsWithSaveConfirmation();
         }
 
+        private void BitmapManager_SelectedToolChanged(object sender, SelectedToolEventArgs e)
+        {
+            e.OldTool.PropertyChanged -= SelectedTool_PropertyChanged;
+            e.NewTool.PropertyChanged += SelectedTool_PropertyChanged;
+
+            NotifyToolActionDisplayChanged();
+        }
+
+        private void SelectedTool_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(Tool.ActionDisplay))
+            {
+                NotifyToolActionDisplayChanged();
+            }
+        }
+
+        private void NotifyToolActionDisplayChanged()
+        {
+            if (!OverrideActionDisplay) RaisePropertyChanged(nameof(ActionDisplay));
+        }
+
         [Conditional("DEBUG")]
         private void AddDebugOnlyViewModels()
         {