1 files changed, 24 insertions, 33 deletions

diff --git a/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs
index ce513b4b..ec919530 100644
--- a/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs
@@ -9,13 +9,14 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class MotionSettingsWindow : UserControl
+    public partial class MotionSettingsWindow : UserControl
     {
         private readonly InputConfiguration<GamepadInputId, StickInputId> _viewmodel;
 
         public MotionSettingsWindow()
         {
             InitializeComponent();
+            DataContext = _viewmodel;
         }
 
         public MotionSettingsWindow(ControllerSettingsViewModel viewmodel)
@@ -36,46 +37,36 @@ namespace Ryujinx.Ava.Ui.Windows
             };
 
             InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
             DataContext = _viewmodel;
-
-            AvaloniaXamlLoader.Load(this);
         }
 
-        public static async Task Show(ControllerSettingsViewModel viewmodel, StyleableWindow window)
+        public static async Task Show(ControllerSettingsViewModel viewmodel)
         {
-            ContentDialog contentDialog = window.ContentDialog;
-
-            string name = string.Empty;
-
             MotionSettingsWindow content = new MotionSettingsWindow(viewmodel);
 
-            if (contentDialog != null)
+            ContentDialog contentDialog = new ContentDialog
             {
-                contentDialog.Title = LocaleManager.Instance["ControllerMotionTitle"];
-                contentDialog.PrimaryButtonText = LocaleManager.Instance["ControllerSettingsSave"];
-                contentDialog.SecondaryButtonText = "";
-                contentDialog.CloseButtonText = LocaleManager.Instance["ControllerSettingsClose"];
-                contentDialog.Content = content;
-                contentDialog.PrimaryButtonClick += (sender, args) =>
-                {
-                    var config = viewmodel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
-                    config.Slot = content._viewmodel.Slot;
-                    config.EnableMotion = content._viewmodel.EnableMotion;
-                    config.Sensitivity = content._viewmodel.Sensitivity;
-                    config.GyroDeadzone = content._viewmodel.GyroDeadzone;
-                    config.AltSlot = content._viewmodel.AltSlot;
-                    config.DsuServerHost = content._viewmodel.DsuServerHost;
-                    config.DsuServerPort = content._viewmodel.DsuServerPort;
-                    config.EnableCemuHookMotion = content._viewmodel.EnableCemuHookMotion;
-                    config.MirrorInput = content._viewmodel.MirrorInput;
-                };
+                Title = LocaleManager.Instance["ControllerMotionTitle"],
+                PrimaryButtonText = LocaleManager.Instance["ControllerSettingsSave"],
+                SecondaryButtonText = "",
+                CloseButtonText = LocaleManager.Instance["ControllerSettingsClose"],
+                Content = content
+            };
+            contentDialog.PrimaryButtonClick += (sender, args) =>
+            {
+                var config = viewmodel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
+                config.Slot = content._viewmodel.Slot;
+                config.EnableMotion = content._viewmodel.EnableMotion;
+                config.Sensitivity = content._viewmodel.Sensitivity;
+                config.GyroDeadzone = content._viewmodel.GyroDeadzone;
+                config.AltSlot = content._viewmodel.AltSlot;
+                config.DsuServerHost = content._viewmodel.DsuServerHost;
+                config.DsuServerPort = content._viewmodel.DsuServerPort;
+                config.EnableCemuHookMotion = content._viewmodel.EnableCemuHookMotion;
+                config.MirrorInput = content._viewmodel.MirrorInput;
+            };
 
-                await contentDialog.ShowAsync();
-            }
+            await contentDialog.ShowAsync();
         }
     }
 }
\ No newline at end of file