Avalonia 12.0.0-preview1

Author: Ruben2776

src/PicView.Avalonia.Win32/Program.cs

@@ -27,6 +27,7 @@ public static AppBuilder BuildAvaloniaApp()
                 UseOpacitySaveLayer = true
             })
             .UseWin32()
+            .UseHarfBuzz()
             .UseSkia();
     }
 }

src/PicView.Avalonia/Clipboard/ClipboardImageOperations.cs

@@ -1,11 +1,8 @@
 using System.Runtime.InteropServices;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Media.Imaging;
-using ImageMagick;
 using PicView.Avalonia.Navigation;
-using PicView.Avalonia.UI;
 using PicView.Avalonia.ViewModels;
 using PicView.Core.DebugTools;
 using PicView.Core.ImageDecoding;
@@ -170,22 +167,22 @@ public static async Task PasteClipboardImage(MainViewModel vm)
 
         foreach (var format in formats)
         {
-            try
-            {
-                var data = await clipboard.GetDataAsync(format);
-                if (data is not byte[] dataBytes)
-                {
-                    continue;
-                }
-
-                using var memoryStream = new MemoryStream(dataBytes);
-                return new Bitmap(memoryStream);
-            }
-            catch (Exception ex)
-            {
-                // Ignore format errors and try next format
-                DebugHelper.LogDebug(nameof(ClipboardImageOperations), nameof(TryGetBitmapFromClipboard), ex);
-            }
+            // try
+            // {
+            //     var data = await clipboard.GetDataAsync(format);
+            //     if (data is not byte[] dataBytes)
+            //     {
+            //         continue;
+            //     }
+            //
+            //     using var memoryStream = new MemoryStream(dataBytes);
+            //     return new Bitmap(memoryStream);
+            // }
+            // catch (Exception ex)
+            // {
+            //     // Ignore format errors and try next format
+            //     DebugHelper.LogDebug(nameof(ClipboardImageOperations), nameof(TryGetBitmapFromClipboard), ex);
+            // }
         }
 
         return null;

src/PicView.Avalonia/Clipboard/ClipboardTextOperations.cs

@@ -1,3 +1,5 @@
+using Avalonia.Input.Platform;
+
 namespace PicView.Avalonia.Clipboard;
 
 /// <summary>

src/PicView.Avalonia/CustomControls/CopyButton.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using PicView.Core.DebugTools;
 

src/PicView.Avalonia/DragAndDrop/DragAndDropHelper.cs

@@ -27,34 +27,28 @@ public static async Task Drop(DragEventArgs e, MainViewModel vm)
     {
         RemoveDragDropView();
 
-        var files = e.Data.GetFiles();
+        var files = e.DataTransfer.TryGetFiles();
         if (files == null)
         {
             await HandleDropFromUrl(e, vm);
             return;
         }
 
-        var storageItems = files as IStorageItem[] ?? files.ToArray();
-        var firstFile = storageItems.FirstOrDefault();
+        var firstFile = files.FirstOrDefault();
         if (firstFile == null)
         {
             return;
         }
 
         // Handle opening additional files in new windows if needed
-        if (storageItems.Length > 1)
+        if (files.Length > 1)
         {
-            _ = Task.Run(() => HandleAdditionalFiles(storageItems.Skip(1)));
+            _ = Task.Run(() => HandleAdditionalFiles(files.Skip(1)));
         }
 
         var path = firstFile.Path.LocalPath;
 
-        if (e.Data.Contains("text/x-moz-url"))
-        {
-            await HandleDropFromUrl(e, vm);
-            await EnsureImageViewerDisplayed(vm);
-        }
-        else if (path.IsSupported())
+        if (path.IsSupported())
         {
             await EnsureImageViewerDisplayed(vm);
             await LoadSupportedFile(path, vm);
@@ -73,15 +67,17 @@ public static async Task Drop(DragEventArgs e, MainViewModel vm)
 
     public static async Task DragEnter(DragEventArgs e, MainViewModel vm, Control control)
     {
-        var files = e.Data.GetFiles();
+        var files = e.DataTransfer.TryGetFiles();
         if (files != null)
         {
             await HandleDragEnterWithFiles(files, vm, control);
         }
         else
         {
-            // Try handling as URL
-            var handled = await HandleDragEnterFromUrl(e.Data.Get("text/x-moz-url"), vm);
+            // // Try handling as URL
+            var value = e.DataTransfer.Items[0];
+
+            var handled = await HandleDragEnterFromUrl(value, vm);
             if (!handled)
             {
                 RemoveDragDropView();
@@ -129,15 +125,17 @@ private static void HandleAdditionalFiles(IEnumerable<IStorageItem> additionalFi
 
     private static async Task HandleDropFromUrl(DragEventArgs e, MainViewModel vm)
     {
-        var urlObject = e.Data.Get("text/x-moz-url");
-        if (urlObject is byte[] bytes)
+        var item = e.DataTransfer.Items[0].TryGetRaw(DataFormat.CreateBytesPlatformFormat("text/x-moz-url"));
+        if (item is not byte[] bytes)
         {
-            var dataStr = Encoding.Unicode.GetString(bytes);
-            var url = dataStr.Split((char)10).FirstOrDefault();
-            if (url != null)
-            {
-                await LoadFromUrl(url, vm);
-            }
+            return;
+        }
+
+        var dataStr = Encoding.Unicode.GetString(bytes);
+        var url = dataStr.Split((char)10).FirstOrDefault();
+        if (url != null)
+        {
+            await LoadFromUrl(url, vm);
         }
     }
 

src/PicView.Avalonia/PicView.Avalonia.csproj

@@ -149,9 +149,9 @@
   </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.3.12"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.3.12"/>
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="AvaloniaUI.DiagnosticsSupport" Version="2.1.1" />
+        <PackageReference Include="Avalonia" Version="12.0.0-preview1"/>
+        <PackageReference Include="Avalonia.Desktop" Version="12.0.0-preview1"/>
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0-beta2"/>
         <PackageReference Include="Magick.NET.AvaloniaMediaImaging" Version="1.1.9"/>
         <PackageReference Include="R3Extensions.Avalonia" Version="1.3.0" />
         <PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.2"/>