fix(Avalonia): use SkiaSharp on FreeBSD

Instead of VelloSharp because it is unstable and hasn't seen any new commits since it was unarchived.

Author: BrycensRanch

SnapX.Avalonia/App.axaml.cs

@@ -517,7 +517,7 @@ public override void OnFrameworkInitializationCompleted()
                 var logoBitmap = new Bitmap(
                     AssetLoader.Open(new Uri("avares://snapx-ui/SnapX_Logo.png"))
                 );
-                if (!OperatingSystem.IsFreeBSD() && SnapX.GetConfiguration().ShowTray)
+                if (SnapX.GetConfiguration().ShowTray)
                 {
                     var trayIcon = new TrayIcon
                     {

SnapX.Avalonia/Program.cs

@@ -3,10 +3,6 @@
 using System.Reflection;
 using Avalonia;
 using SnapX.Avalonia;
-#if FREEBSD
-using VelloSharp;
-using VelloSharp.Avalonia.Vello;
-#endif
 #if BROWSER
 using Avalonia.Browser;
 #else
@@ -21,19 +17,21 @@ public static void Main(string[] args)
     {
         if (args.Length != 0 && (args[0] == "--version" || args[0] == "-v"))
         {
-            var informationalVersion = Assembly.GetExecutingAssembly()
-                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
-                .InformationalVersion ?? "Unknown";
+            var informationalVersion =
+                Assembly
+                    .GetExecutingAssembly()
+                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
+                    ?.InformationalVersion ?? "Unknown";
 
             Console.WriteLine(informationalVersion);
             return;
         }
 
         BuildAvaloniaApp()
 #if !BROWSER
-            .StartWithClassicDesktopLifetime(args);
+        .StartWithClassicDesktopLifetime(args);
 #else
-            .StartBrowserAppAsync("out");
+        .StartBrowserAppAsync("out");
 #endif
     }
 
@@ -46,51 +44,44 @@ public static AppBuilder BuildAvaloniaApp()
 #else
         if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
         {
-            builder = builder.With(new FontManagerOptions
-            {
-                FontFallbacks = new List<FontFallback>
+            builder = builder.With(
+                new FontManagerOptions
                 {
-                    new() { FontFamily = "Noto Sans" },
-                    new() { FontFamily = "Roboto" },
-                    new() { FontFamily = "Adwaita Sans" },
-                    new() { FontFamily = "Open Sans" },
-                    new() { FontFamily = "Segoe UI" },
-                    new() { FontFamily = "Inter" }, // kept for compatibility
-                    new() { FontFamily = "Helvetica Neue" },
+                    FontFallbacks = new List<FontFallback>
+                    {
+                        new() { FontFamily = "Noto Sans" },
+                        new() { FontFamily = "Roboto" },
+                        new() { FontFamily = "Adwaita Sans" },
+                        new() { FontFamily = "Open Sans" },
+                        new() { FontFamily = "Segoe UI" },
+                        new() { FontFamily = "Inter" }, // kept for compatibility
+                        new() { FontFamily = "Helvetica Neue" },
+                    },
                 }
-            });
+            );
         }
 
         builder = builder.LogToTrace();
 
         var x11Options = new X11PlatformOptions
         {
-            RenderingMode = [X11RenderingMode.Vulkan, X11RenderingMode.Egl, X11RenderingMode.Glx, X11RenderingMode.Software],
+            RenderingMode =
+            [
+                X11RenderingMode.Vulkan,
+                X11RenderingMode.Egl,
+                X11RenderingMode.Glx,
+                X11RenderingMode.Software,
+            ],
             UseRetainedFramebuffer = true,
-            OverlayPopups = true
+            OverlayPopups = true,
         };
 
-        if (OperatingSystem.IsFreeBSD() || Environment.GetEnvironmentVariable("SNAPX_PRETEND_FREEBSD") is not null)
-        {
-#if FREEBSD
-            // Region selector yields a black screen if not using software. Still ULTRA GPU ACCELERATED!
-            x11Options.RenderingMode = [X11RenderingMode.Software];
-            builder = builder
-                .UseSkia()
-                .UseX11()
-                .UseVello(new VelloPlatformOptions { FramesPerSecond = 240, PresentMode = PresentMode.Fifo, Antialiasing = AntialiasingMode.Msaa16})
-                .With(x11Options);
-#endif
-        }
-        else
-        {
-            builder = builder
-                .UsePlatformDetect()
-                .UseManagedSystemDialogs()
-                .With(x11Options)
-                .With(new AvaloniaNativePlatformOptions { OverlayPopups = true })
-                .With(new Win32PlatformOptions { OverlayPopups = true });
-        }
+        builder = builder
+            .UsePlatformDetect()
+            .UseManagedSystemDialogs()
+            .With(x11Options)
+            .With(new AvaloniaNativePlatformOptions { OverlayPopups = true })
+            .With(new Win32PlatformOptions { OverlayPopups = true });
 
         return builder;
 #endif

SnapX.Avalonia/SnapX.Avalonia.csproj

@@ -15,10 +15,8 @@
     <HarfBuzzSharpVersion>8.3.1.2</HarfBuzzSharpVersion>
     <VelloSharpVersion>0.5.0-alpha.3</VelloSharpVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <!-- Packagers: Do not modify the AssemblyName, it will break the compilation of XAML that depends on it being called snapx-ui. Instead create a executable shell script that calls snapx-ui -->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFreeBSD)' != 'true'">
     <ApplicationIcon>Assets\SnapX_Icon.ico</ApplicationIcon>
+    <!-- Packagers: Do not modify the AssemblyName, it will break the compilation of XAML that depends on it being called snapx-ui. Instead create a executable shell script that calls snapx-ui -->
   </PropertyGroup>
 <!--  <PropertyGroup Condition="'$(TargetWindows)' == 'true'">-->
 <!--    <AvaloniaVersion>11.3.4</AvaloniaVersion>-->
@@ -80,15 +78,14 @@
     <PackageReference Remove="Avalonia.X11" />
     <PackageReference Include="BrycensRanch.Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <PackageReference Include="BrycensRanch.Avalonia.X11" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="VelloSharp.Avalonia.Vello" Version="$(VelloSharpVersion)" />
-    <PackageReference Include="VelloSharp.HarfBuzzSharp" Version="$(VelloSharpVersion)" />
-    <PackageReference Remove="HarfBuzzSharp" />
+    <PackageReference Remove="SkiaSharp.NativeAssets.Linux" />
+    <PackageReference Remove="SkiaSharp.NativeAssets.macOS" />
+    <PackageReference Remove="SkiaSharp.NativeAssets.Win32" />
+    <PackageReference Remove="SkiaSharp.NativeAssets.WebAssembly" />
     <PackageReference Remove="HarfBuzzSharp.NativeAssets.Linux" />
     <PackageReference Remove="HarfBuzzSharp.NativeAssets.macOS" />
     <PackageReference Remove="HarfBuzzSharp.NativeAssets.Win32" />
     <PackageReference Remove="HarfBuzzSharp.NativeAssets.WebAssembly" />
-    <PackageReference Include="VelloSharp.Native.Vello" Version="$(VelloSharpVersion)" />
-    <PackageReference Include="BrycensRanch.VelloSharp.Native.Vello.freebsd-x64" Version="$(VelloSharpVersion)" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Controls\" />