UI: Fix diaglog popups doubling the window controls and laying text o…

…ver the menu bar.

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -122,7 +122,7 @@ public bool DisplayInputDialog(SoftwareKeyboardUIArgs args, out string userText)
             {
                 try
                 {
-                    MainWindow.ViewModel.AppHost.NpadManager.BlockInputUpdates();
+                    _parent.ViewModel.AppHost.NpadManager.BlockInputUpdates();
                     var response = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args);
 
                     if (response.Result == UserResult.Ok)
@@ -144,7 +144,7 @@ public bool DisplayInputDialog(SoftwareKeyboardUIArgs args, out string userText)
             });
 
             dialogCloseEvent.WaitOne();
-            MainWindow.ViewModel.AppHost.NpadManager.UnblockInputUpdates();
+            _parent.ViewModel.AppHost.NpadManager.UnblockInputUpdates();
 
             userText = error ? null : inputText;
 
@@ -154,7 +154,7 @@ public bool DisplayInputDialog(SoftwareKeyboardUIArgs args, out string userText)
         public void ExecuteProgram(Switch device, ProgramSpecifyKind kind, ulong value)
         {
             device.Configuration.UserChannelPersistence.ExecuteProgram(kind, value);
-            MainWindow.ViewModel.AppHost?.Stop();
+            _parent.ViewModel.AppHost?.Stop();
         }
 
         public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)

src/Ryujinx/UI/Applet/AvaloniaDynamicTextInputHandler.cs

@@ -129,7 +129,7 @@ public void Dispose()
             Dispatcher.UIThread.Post(() =>
             {
                 _hiddenTextBox.Clear();
-                MainWindow.ViewModel.RendererHostControl.Focus();
+                _parent.ViewModel.RendererHostControl.Focus();
 
                 _parent = null;
             });

src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml.cs

@@ -7,7 +7,7 @@
 
 namespace Ryujinx.Ava.UI.Applet
 {
-    internal partial class ErrorAppletWindow : StyleableWindow
+    internal partial class ErrorAppletWindow : StyleableAppWindow
     {
         private readonly Window _owner;
         private object _buttonResponse;

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -85,7 +85,7 @@ public async static Task<UserResult> ShowTextDialog(
         }
 
         public static Task<UserResult> ShowDeferredContentDialog(
-            StyleableWindow window,
+            Window window,
             string title,
             string primaryText,
             string secondaryText,

src/Ryujinx/UI/Models/SaveModel.cs

@@ -47,7 +47,7 @@ public SaveModel(SaveDataInfo info)
             TitleId = info.ProgramId;
             UserId = info.UserId;
 
-            var appData = MainWindow.ViewModel.Applications.FirstOrDefault(x => x.IdString.Equals(TitleIdString, StringComparison.OrdinalIgnoreCase));
+            var appData = MainWindow.MainWindowViewModel.Applications.FirstOrDefault(x => x.IdString.Equals(TitleIdString, StringComparison.OrdinalIgnoreCase));
 
             InGameList = appData != null;
 

src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -33,7 +33,7 @@ public class AmiiboWindowViewModel : BaseModel, IDisposable
         private readonly string _amiiboJsonPath;
         private readonly byte[] _amiiboLogoBytes;
         private readonly HttpClient _httpClient;
-        private readonly StyleableWindow _owner;
+        private readonly StyleableAppWindow _owner;
 
         private Bitmap _amiiboImage;
         private List<AmiiboApi> _amiiboList;
@@ -49,7 +49,7 @@ public class AmiiboWindowViewModel : BaseModel, IDisposable
 
         private static readonly AmiiboJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
-        public AmiiboWindowViewModel(StyleableWindow owner, string lastScannedAmiiboId, string titleId)
+        public AmiiboWindowViewModel(StyleableAppWindow owner, string lastScannedAmiiboId, string titleId)
         {
             _owner = owner;
 

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -244,7 +244,7 @@ public InputViewModel(UserControl owner) : this()
                 _mainWindow.InputManager.GamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
                 _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
 
-                MainWindow.ViewModel.AppHost?.NpadManager.BlockInputUpdates();
+                _mainWindow.ViewModel.AppHost?.NpadManager.BlockInputUpdates();
 
                 _isLoaded = false;
 
@@ -357,18 +357,12 @@ private void LoadInputDriver()
 
         private void HandleOnGamepadDisconnected(string id)
         {
-            Dispatcher.UIThread.Post(() =>
-            {
-                LoadDevices();
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
         }
 
         private void HandleOnGamepadConnected(string id)
         {
-            Dispatcher.UIThread.Post(() =>
-            {
-                LoadDevices();
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
         }
 
         private string GetCurrentGamepadId()
@@ -847,7 +841,7 @@ public void Save()
                 }
             }
 
-            MainWindow.ViewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
+            _mainWindow.ViewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
 
             // Atomically replace and signal input change.
             // NOTE: Do not modify InputConfig.Value directly as other code depends on the on-change event.
@@ -879,7 +873,7 @@ public void Dispose()
             _mainWindow.InputManager.GamepadDriver.OnGamepadConnected -= HandleOnGamepadConnected;
             _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected -= HandleOnGamepadDisconnected;
 
-            MainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();
+            _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();
 
             SelectedGamepad?.Dispose();
 

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -95,26 +95,23 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
 
             if (VisualRoot is MainWindow window)
             {
-                Window = window;
+                DataContext = ViewModel = window.ViewModel;
             }
-
-            ViewModel = MainWindow.ViewModel;
-            DataContext = ViewModel;
         }
 
         private async void StopEmulation_Click(object sender, RoutedEventArgs e)
         {
-            await MainWindow.ViewModel.AppHost?.ShowExitPrompt().OrCompleted()!;
+            await ViewModel.AppHost?.ShowExitPrompt().OrCompleted()!;
         }
 
         private void PauseEmulation_Click(object sender, RoutedEventArgs e)
         {
-            MainWindow.ViewModel.AppHost?.Pause();
+            ViewModel.AppHost?.Pause();
         }
 
         private void ResumeEmulation_Click(object sender, RoutedEventArgs e)
         {
-            MainWindow.ViewModel.AppHost?.Resume();
+            ViewModel.AppHost?.Resume();
         }
 
         public async void OpenSettings(object sender, RoutedEventArgs e)
@@ -178,15 +175,15 @@ public async void OpenCheatManagerForCurrentApp(object sender, RoutedEventArgs e
                 Window.VirtualFileSystem,
                 ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText,
                 name,
-                MainWindow.ViewModel.SelectedApplication.Path).ShowDialog(Window);
+                ViewModel.SelectedApplication.Path).ShowDialog(Window);
 
             ViewModel.AppHost.Device.EnableCheats();
         }
 
         private void ScanAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (sender is MenuItem)
-                ViewModel.IsAmiiboRequested = MainWindow.ViewModel.AppHost.Device.System.SearchingForAmiibo(out _);
+                ViewModel.IsAmiiboRequested = ViewModel.AppHost.Device.System.SearchingForAmiibo(out _);
         }
 
         private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -26,16 +26,15 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
             if (VisualRoot is MainWindow window)
             {
                 Window = window;
+                DataContext = window.ViewModel;
             }
-
-            DataContext = MainWindow.ViewModel;
         }
 
         private void VsyncStatus_PointerReleased(object sender, PointerReleasedEventArgs e)
         {
-            MainWindow.ViewModel.AppHost.ToggleVSync();
+            Window.ViewModel.AppHost.ToggleVSync();
 
-            Logger.Info?.Print(LogClass.Application, $"VSync toggled to: {MainWindow.ViewModel.AppHost.Device.EnableDeviceVsync}");
+            Logger.Info?.Print(LogClass.Application, $"VSync toggled to: {Window.ViewModel.AppHost.Device.EnableDeviceVsync}");
         }
 
         private void DockedStatus_PointerReleased(object sender, PointerReleasedEventArgs e)
@@ -57,9 +56,9 @@ private void Refresh_OnClick(object sender, RoutedEventArgs e)
         private void VolumeStatus_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
         {
             // Change the volume by 5% at a time
-            float newValue = MainWindow.ViewModel.Volume + (float)e.Delta.Y * 0.05f;
+            float newValue = Window.ViewModel.Volume + (float)e.Delta.Y * 0.05f;
 
-            MainWindow.ViewModel.Volume = newValue switch
+            Window.ViewModel.Volume = newValue switch
             {
                 < 0 => 0,
                 > 1 => 1,

src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs

@@ -22,12 +22,11 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
 
-            if (VisualRoot is MainWindow)
+            if (VisualRoot is MainWindow window)
             {
-                ViewModel = MainWindow.ViewModel;
+                DataContext = ViewModel = window.ViewModel;
             }
 
-            DataContext = ViewModel;
         }
 
         public void Sort_Checked(object sender, RoutedEventArgs args)

src/Ryujinx/UI/Windows/AmiiboWindow.axaml

@@ -1,4 +1,4 @@
-<window:StyleableWindow
+<window:StyleableAppWindow
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -72,4 +72,4 @@
                     Click="CancelButton_Click" />
         </Grid>
     </Grid>
-</window:StyleableWindow>
+</window:StyleableAppWindow>

src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs

@@ -5,7 +5,7 @@
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AmiiboWindow : StyleableWindow
+    public partial class AmiiboWindow : StyleableAppWindow
     {
         public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
         {

src/Ryujinx/UI/Windows/CheatWindow.axaml

@@ -1,4 +1,4 @@
-<window:StyleableWindow
+<window:StyleableAppWindow
     x:Class="Ryujinx.Ava.UI.Windows.CheatWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -123,4 +123,4 @@
             </DockPanel>
         </DockPanel>
     </Grid>
-</window:StyleableWindow>
+</window:StyleableAppWindow>

src/Ryujinx/UI/Windows/CheatWindow.axaml.cs

@@ -14,7 +14,7 @@
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class CheatWindow : StyleableWindow
+    public partial class CheatWindow : StyleableAppWindow
     {
         private readonly string _enabledCheatsPath;
         public bool NoCheatsFound { get; }

src/Ryujinx/UI/Windows/ContentDialogOverlayWindow.axaml

@@ -1,4 +1,4 @@
-<window:StyleableWindow
+<window:StyleableAppWindow
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -11,15 +11,15 @@
     x:Class="Ryujinx.Ava.UI.Windows.ContentDialogOverlayWindow"
     Title="ContentDialogOverlayWindow"
     Focusable="False">
-    <window:StyleableWindow.Styles>
+    <window:StyleableAppWindow.Styles>
         <Style Selector="ui|ContentDialog /template/ Panel#LayoutRoot">
             <Setter Property="Background"
                     Value="Transparent" />
         </Style>
-    </window:StyleableWindow.Styles>
+    </window:StyleableAppWindow.Styles>
     <ui:ContentDialog Name="ContentDialog"
                       IsPrimaryButtonEnabled="True"
                       IsSecondaryButtonEnabled="True"
                       IsVisible="False"
                       Focusable="True"/>
-</window:StyleableWindow>
+</window:StyleableAppWindow>

src/Ryujinx/UI/Windows/ContentDialogOverlayWindow.axaml.cs

@@ -9,7 +9,7 @@ public ContentDialogOverlayWindow()
         {
             InitializeComponent();
 
-            TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent };
+            TransparencyLevelHint = [WindowTransparencyLevel.Transparent];
             WindowStartupLocation = WindowStartupLocation.Manual;
             SystemDecorations = SystemDecorations.None;
             ExtendClientAreaTitleBarHeightHint = 0;

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -1,4 +1,4 @@
-<window:StyleableWindow
+<window:StyleableAppWindow
     x:Class="Ryujinx.Ava.UI.Windows.MainWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -200,4 +200,4 @@
                 Grid.Row="2" />
         </Grid>
     </Grid>
-</window:StyleableWindow>
+</window:StyleableAppWindow>

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -35,9 +35,11 @@
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class MainWindow : StyleableWindow
+    public partial class MainWindow : StyleableAppWindow
     {
-        internal static MainWindowViewModel ViewModel { get; private set; }
+        internal static MainWindowViewModel MainWindowViewModel { get; private set; }
+
+        public MainWindowViewModel ViewModel { get; }
 
         internal readonly AvaHostUIHandler UiHandler;
 
@@ -69,7 +71,7 @@ public partial class MainWindow : StyleableWindow
 
         public MainWindow()
         {
-            DataContext = ViewModel = new MainWindowViewModel();
+            DataContext = ViewModel = MainWindowViewModel = new MainWindowViewModel();
 
             InitializeComponent();
             Load();
@@ -78,8 +80,8 @@ public MainWindow()
 
             ViewModel.Title = App.FormatTitle();
 
-            TitleBar.ExtendsContentIntoTitleBar = true;
-            TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
+            //TitleBar.ExtendsContentIntoTitleBar = true;
+            //TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
 
 
             // NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -1,4 +1,4 @@
-<window:StyleableWindow
+<window:StyleableAppWindow
     x:Class="Ryujinx.Ava.UI.Windows.SettingsWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
@@ -127,4 +127,4 @@
                 Command="{Binding ApplyButton}" />
         </ReversibleStackPanel>
     </Grid>
-</window:StyleableWindow>
+</window:StyleableAppWindow>

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -8,7 +8,7 @@
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class SettingsWindow : StyleableWindow
+    public partial class SettingsWindow : StyleableAppWindow
     {
         internal SettingsViewModel ViewModel { get; set; }