mirrors/ryujinx
0
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-12-12 22:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move more of the setup wizard logic into the setup wizard itself instead of having some critical logic in a random lambda in MainWindow.axaml.cs

Browse source
This commit is contained in:
GreemDev 2025-11-22 20:33:28 -06:00
parent 615b2c8b8a
commit c4873ca06b
5 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs
View file

@ -1,19 +1,19 @@
using Avalonia.Controls;
using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.Systems.SetupWizard;
using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Ava.UI.Windows;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging;
using System;
using System.IO;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.SetupWizard
{
public partial class RyujinxSetupWizardWindow : StyleableAppWindow
{
public static bool IsUsingSetupWizard { get; set; }
public RyujinxSetupWizardWindow() : base(useCustomTitleBar: true)
{
InitializeComponent();
@ -24,18 +24,22 @@ namespace Ryujinx.Ava.UI.SetupWizard
}
}
public static RyujinxSetupWizardWindow CreateWindow(MainWindowViewModel mwvm, out BaseSetupWizard setupWizard)
public static Task ShowAsync(Window owner = null)
{
Task windowTask = ShowAsync(
CreateWindow(out BaseSetupWizard wiz),
owner ?? RyujinxApp.MainWindow
);
_ = wiz.Start();
return windowTask;
}
public static RyujinxSetupWizardWindow CreateWindow(out BaseSetupWizard setupWizard)
{
RyujinxSetupWizardWindow window = new();
window.DataContext = setupWizard = new RyujinxSetupWizard(window.WizardPresenter, mwvm, () =>
{
NotificationHelper.SetNotificationManager(RyujinxApp.MainWindow);
window.Close();
IsUsingSetupWizard = false;
});
window.DataContext = setupWizard = new RyujinxSetupWizard(window);
window.Height = 600;
window.Width = 750;
NotificationHelper.SetNotificationManager(window);
return window;
}
@ -82,4 +86,3 @@ namespace Ryujinx.Ava.UI.SetupWizard
}
}
}