Maybe reduce design time command errors

src/PixiEditor/Models/Commands/XAML/Command.cs

@@ -1,7 +1,6 @@
 using System.Windows.Input;
 using System.Windows.Markup;
 using PixiEditor.Helpers;
-using PixiEditor.ViewModels;
 
 namespace PixiEditor.Models.Commands.XAML;
 
@@ -21,11 +20,6 @@ internal class Command : MarkupExtension
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        if (commandController == null)
-        {
-            commandController = ViewModelMain.Current.CommandController;
-        }
-
         if (Windows.ApplicationModel.DesignMode.DesignModeEnabled)
         {
             var attribute = DesignCommandHelpers.GetCommandAttribute(Name);
@@ -40,6 +34,11 @@ internal class Command : MarkupExtension
                 }, false);
         }
 
+        if (commandController is null)
+        {
+            commandController = ViewModelMain.Current.CommandController;
+        }
+
         var command = commandController.Commands[Name];
         return GetPixiCommand ? command : GetICommand(command, UseProvided);
     }

src/PixiEditor/Models/Commands/XAML/ShortcutBinding.cs

@@ -2,7 +2,6 @@
 using System.Windows.Markup;
 using PixiEditor.Helpers;
 using PixiEditor.Models.DataHolders;
-using PixiEditor.ViewModels;
 using ActualCommand = PixiEditor.Models.Commands.Commands.Command;
 
 namespace PixiEditor.Models.Commands.XAML;
@@ -19,17 +18,17 @@ internal class ShortcutBinding : MarkupExtension
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
+        //if (Windows.ApplicationModel.DesignMode.DesignModeEnabled)
+        //{
+        var attribute = DesignCommandHelpers.GetCommandAttribute(Name);
+        return new KeyCombination(attribute.Key, attribute.Modifiers).ToString();
+        //}
+
         if (commandController == null)
         {
             commandController = ViewModelMain.Current.CommandController;
         }
 
-        if (Windows.ApplicationModel.DesignMode.DesignModeEnabled)
-        {
-            var attribute = DesignCommandHelpers.GetCommandAttribute(Name);
-            return new KeyCombination(attribute.Key, attribute.Modifiers).ToString();
-        }
-
         return GetBinding(commandController.Commands[Name]).ProvideValue(serviceProvider);
     }