From 47639e6eebe6f24bc6e0796fa27a750d9e99bd87 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
Date: Tue, 14 May 2024 11:36:11 -0400
Subject: [PATCH] Bump Avalonia.Svg (#6603)
* Bump Avalonia.Svg
* Remove using
* Bump Version
* Remove other reload
---
Directory.Packages.props | 4 ++--
src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs | 5 +----
src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs | 4 +---
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index ef274125..d04e237e 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,8 +8,8 @@
<PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
- <PackageVersion Include="Avalonia.Svg" Version="11.0.0.16" />
- <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.16" />
+ <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
+ <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Concentus" Version="1.1.7" />
<PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
diff --git a/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
index 5a98b164..6b999b1f 100644
--- a/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
+++ b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
@@ -9,7 +9,6 @@ using Ryujinx.Ava.UI.Windows;
using Ryujinx.Common;
using Ryujinx.HLE.HOS.Applets;
using Ryujinx.HLE.HOS.Services.Hid;
-using System;
using System.Linq;
using System.Threading.Tasks;
@@ -104,9 +103,7 @@ namespace Ryujinx.Ava.UI.Applet
if (!string.IsNullOrWhiteSpace(path))
{
- SvgSource source = new(default(Uri));
-
- source.Load(EmbeddedResources.GetStream(path));
+ SvgSource source = SvgSource.LoadFromStream(EmbeddedResources.GetStream(path));
image.Source = source;
}
diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 74da4597..89cc6496 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -181,9 +181,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
if (!string.IsNullOrWhiteSpace(_controllerImage))
{
- SvgSource source = new(default(Uri));
-
- source.Load(EmbeddedResources.GetStream(_controllerImage));
+ SvgSource source = SvgSource.LoadFromStream(EmbeddedResources.GetStream(_controllerImage));
image.Source = source;
}