Explorar o código

Fixed macos native menu not being aware of context

Krzysztof Krysiński hai 3 semanas
pai
achega
7afb70cef9

+ 4 - 4
src/PixiEditor/Models/Commands/XAML/NativeMenu.cs

@@ -65,10 +65,10 @@ internal class NativeMenu : global::Avalonia.Controls.Menu
         {
             if (!ShortcutController.ShortcutExecutionBlocked)
             {
-                if (iCommand.CanExecute(parameter))
-                {
-                    iCommand.Execute(parameter);
-                }
+                ViewModelMain.Current.ShortcutController.KeyPressed(
+                    false,
+                    command.Shortcut.Key,
+                    command.Shortcut.Modifiers);
             }
             else
             {

+ 1 - 1
src/PixiEditor/Models/Controllers/ClipboardController.cs

@@ -848,7 +848,7 @@ internal static class ClipboardController
         data.Set(ClipboardDataFormats.DocumentFormat, Encoding.UTF8.GetBytes(docId.ToString()));
 
         byte[] idsBytes = Encoding.UTF8.GetBytes(string.Join(";", ids.Select(x => x.ToString())));
-
+        
         data.Set(format, idsBytes);
 
         await Clipboard.SetDataObjectAsync(data);

+ 1 - 1
src/PixiEditor/ViewModels/SubViewModels/ClipboardViewModel.cs

@@ -398,7 +398,7 @@ internal class ClipboardViewModel : SubViewModel<ViewModelMain>
         var selectedNodes = doc.NodeGraph.AllNodes.Where(x => x.IsNodeSelected).Select(x => x.Id).ToArray();
         if (selectedNodes.Length == 0)
             return;
-
+        
         await ClipboardController.CopyNodes(selectedNodes, doc.Id);
 
         areNodesInClipboard = true;