소스 검색

Add macOS runtime check to clipboard file operations and fix CopyFileMenuItem name placement

Ruben 2 달 전
부모
커밋
fdd2e53277
2개의 변경된 파일10개의 추가작업 그리고 4개의 파일을 삭제
  1. 7 1
      src/PicView.Avalonia/Clipboard/ClipboardFileOperations.cs
  2. 3 3
      src/PicView.Avalonia/Views/Main/MainView.axaml

+ 7 - 1
src/PicView.Avalonia/Clipboard/ClipboardFileOperations.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Runtime.InteropServices;
 using Avalonia.Platform.Storage;
 using Avalonia.Platform.Storage;
 using PicView.Avalonia.Animations;
 using PicView.Avalonia.Animations;
 using PicView.Avalonia.Navigation;
 using PicView.Avalonia.Navigation;
@@ -124,6 +124,12 @@ public static class ClipboardFileOperations
             return;
             return;
         }
         }
 
 
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            // TODO add clipboard file copy on macOS 
+            return;
+        }
+
         var tasks = new[]
         var tasks = new[]
         {
         {
             AnimationsHelper.CopyAnimation(),
             AnimationsHelper.CopyAnimation(),

+ 3 - 3
src/PicView.Avalonia/Views/Main/MainView.axaml

@@ -896,8 +896,7 @@
                 CommandParameter="{CompiledBinding PicViewer.FileInfo.Value.FullName,
                 CommandParameter="{CompiledBinding PicViewer.FileInfo.Value.FullName,
                                                    FallbackValue=''}"
                                                    FallbackValue=''}"
                 Header="{CompiledBinding Translation.Copy.Value,
                 Header="{CompiledBinding Translation.Copy.Value,
-                                         Mode=OneWay}"
-                x:Name="CopyFileMenuItem">
+                                         Mode=OneWay}">
                 <MenuItem.Icon>
                 <MenuItem.Icon>
                     <Path
                     <Path
                         Data="{StaticResource CopyGeometry}"
                         Data="{StaticResource CopyGeometry}"
@@ -996,7 +995,8 @@
                 Header="{CompiledBinding Translation.CopyFile.Value,
                 Header="{CompiledBinding Translation.CopyFile.Value,
                                          Mode=OneWay}"
                                          Mode=OneWay}"
                 IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
                 IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
-                                            Converter={x:Static ObjectConverters.IsNotNull}}">
+                                            Converter={x:Static ObjectConverters.IsNotNull}}"
+                x:Name="CopyFileMenuItem">
                 <MenuItem.Icon>
                 <MenuItem.Icon>
                     <Path
                     <Path
                         Data="{StaticResource CopyGeometry}"
                         Data="{StaticResource CopyGeometry}"