From fd2b5a7fc1e60d2355f3aba488fef9138b67e3b4 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 1 Jan 2025 01:12:00 -0600 Subject: [PATCH] misc: Remove RendererHost AXAML --- src/Ryujinx/UI/Renderer/RendererHost.axaml | 12 ------------ .../{RendererHost.axaml.cs => RendererHost.cs} | 13 ++++++------- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 src/Ryujinx/UI/Renderer/RendererHost.axaml rename src/Ryujinx/UI/Renderer/{RendererHost.axaml.cs => RendererHost.cs} (94%) diff --git a/src/Ryujinx/UI/Renderer/RendererHost.axaml b/src/Ryujinx/UI/Renderer/RendererHost.axaml deleted file mode 100644 index e0b586b45..000000000 --- a/src/Ryujinx/UI/Renderer/RendererHost.axaml +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs b/src/Ryujinx/UI/Renderer/RendererHost.cs similarity index 94% rename from src/Ryujinx/UI/Renderer/RendererHost.axaml.cs rename to src/Ryujinx/UI/Renderer/RendererHost.cs index fa9aec0c5..7dfec8d62 100644 --- a/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs +++ b/src/Ryujinx/UI/Renderer/RendererHost.cs @@ -1,16 +1,15 @@ -using Avalonia; +using Avalonia; using Avalonia.Controls; -using Gommon; +using Avalonia.Media; using Ryujinx.Ava.Utilities.Configuration; using Ryujinx.Common; using Ryujinx.Common.Configuration; using Ryujinx.Common.Logging; using System; -using System.Runtime.InteropServices; namespace Ryujinx.Ava.UI.Renderer { - public partial class RendererHost : UserControl, IDisposable + public class RendererHost : UserControl, IDisposable { public readonly EmbeddedWindow EmbeddedWindow; @@ -19,7 +18,8 @@ namespace Ryujinx.Ava.UI.Renderer public RendererHost() { - InitializeComponent(); + Focusable = true; + FlowDirection = FlowDirection.LeftToRight; EmbeddedWindow = ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch { @@ -43,8 +43,6 @@ namespace Ryujinx.Ava.UI.Renderer public RendererHost(string titleId) { - InitializeComponent(); - switch (TitleIDs.SelectGraphicsBackend(titleId, ConfigurationState.Instance.Graphics.GraphicsBackend)) { case GraphicsBackend.OpenGl: @@ -109,3 +107,4 @@ namespace Ryujinx.Ava.UI.Renderer } } } +