Skip to content

Commit fdd2e53

Browse files
committed
Add macOS runtime check to clipboard file operations and fix CopyFileMenuItem name placement
1 parent 0f8f010 commit fdd2e53

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/PicView.Avalonia/Clipboard/ClipboardFileOperations.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Diagnostics;
1+
using System.Runtime.InteropServices;
22
using Avalonia.Platform.Storage;
33
using PicView.Avalonia.Animations;
44
using PicView.Avalonia.Navigation;
@@ -124,6 +124,12 @@ public static async Task CopyFileToClipboard(string? filePath, MainViewModel vm)
124124
return;
125125
}
126126

127+
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
128+
{
129+
// TODO add clipboard file copy on macOS
130+
return;
131+
}
132+
127133
var tasks = new[]
128134
{
129135
AnimationsHelper.CopyAnimation(),

src/PicView.Avalonia/Views/Main/MainView.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -896,8 +896,7 @@
896896
CommandParameter="{CompiledBinding PicViewer.FileInfo.Value.FullName,
897897
FallbackValue=''}"
898898
Header="{CompiledBinding Translation.Copy.Value,
899-
Mode=OneWay}"
900-
x:Name="CopyFileMenuItem">
899+
Mode=OneWay}">
901900
<MenuItem.Icon>
902901
<Path
903902
Data="{StaticResource CopyGeometry}"
@@ -996,7 +995,8 @@
996995
Header="{CompiledBinding Translation.CopyFile.Value,
997996
Mode=OneWay}"
998997
IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
999-
Converter={x:Static ObjectConverters.IsNotNull}}">
998+
Converter={x:Static ObjectConverters.IsNotNull}}"
999+
x:Name="CopyFileMenuItem">
10001000
<MenuItem.Icon>
10011001
<Path
10021002
Data="{StaticResource CopyGeometry}"

0 commit comments

Comments
 (0)