vance/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryubing/Ryujinx.git synced 2025-03-10 00:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Move the windows that are shown via ContentDialogs out of Ryujinx.Ava.UI.Windows (they're not windows)

Browse Source
This commit is contained in:
Evan Husted 2025-03-05 22:06:20 -06:00
parent f3a9cecf72
commit d87d3235e9
20 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx/AppHost.cs
View File

@ -6,7 +6,6 @@ using Avalonia.Threading;
using DiscordRPC;
using LibHac.Common;
using LibHac.Ns;
using LibHac.Tools.FsSystem;
using Ryujinx.Audio.Backends.Dummy;
using Ryujinx.Audio.Backends.OpenAL;
using Ryujinx.Audio.Backends.SDL2;
@ -35,7 +34,6 @@ using Ryujinx.Graphics.GAL.Multithreading;
using Ryujinx.Graphics.Gpu;
using Ryujinx.Graphics.OpenGL;
using Ryujinx.Graphics.Vulkan;
using Ryujinx.HLE;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.Account.Acc;

7
src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
View File

@ -13,6 +13,7 @@ using Ryujinx.Ava.UI.Views.Misc;
using Ryujinx.Ava.UI.Windows;
using Ryujinx.Ava.Utilities;
using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Ava.UI.Views.Dialog;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Helper;
using Ryujinx.HLE.HOS;
@ -80,13 +81,13 @@ namespace Ryujinx.Ava.UI.Controls
public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
{
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
await TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
}
public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
{
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
await DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
}
public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
@ -127,7 +128,7 @@ namespace Ryujinx.Ava.UI.Controls
public async void OpenModManager_Click(object sender, RoutedEventArgs args)
{
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
await ModManagerWindow.Show(
await ModManagerView.Show(
viewModel.SelectedApplication.Id,
viewModel.SelectedApplication.IdBase,
viewModel.ApplicationLibrary,

4
src/Ryujinx/UI/Windows/IconColorPicker.cs → src/Ryujinx/UI/Helpers/IconColorPicker.cs
View File

@ -2,9 +2,9 @@ using SkiaSharp;
using System;
using System.Collections.Generic;
namespace Ryujinx.Ava.UI.Windows
namespace Ryujinx.Ava.UI.Helpers
{
static class IconColorPicker
public static class IconColorPicker
{
private const int ColorsPerLine = 64;
private const int TotalColors = ColorsPerLine * ColorsPerLine;

0
src/Ryujinx/RyujinxApp.axaml → src/Ryujinx/UI/RyujinxApp.axaml
View File

4
src/Ryujinx/RyujinxApp.axaml.cs → src/Ryujinx/UI/RyujinxApp.axaml.cs
View File

@ -13,6 +13,8 @@ using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.Windows;
using Ryujinx.Ava.Utilities;
using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.UI.Views.Dialog;
using Ryujinx.Ava.UI.Views.Misc;
using Ryujinx.Common;
using Ryujinx.Common.Logging;
using System;
@ -150,7 +152,7 @@ namespace Ryujinx.Ava
private async void AboutRyujinx_OnClick(object sender, EventArgs e)
{
await AboutWindow.Show();
await AboutView.Show();
}
}
}

2
src/Ryujinx/UI/Windows/AboutWindow.axaml → src/Ryujinx/UI/Views/Dialog/AboutView.axaml
View File

@ -1,5 +1,5 @@
<UserControl
x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
x:Class="Ryujinx.Ava.UI.Views.Dialog.AboutView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

10
src/Ryujinx/UI/Windows/AboutWindow.axaml.cs → src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs
View File

@ -1,8 +1,6 @@
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Layout;
using Avalonia.Styling;
using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Controls;
@ -13,11 +11,11 @@ using Ryujinx.Common.Helper;
using System.Threading.Tasks;
using Button = Avalonia.Controls.Button;
namespace Ryujinx.Ava.UI.Windows
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
public partial class AboutView : RyujinxControl<AboutWindowViewModel>
{
public AboutWindow()
public AboutView()
{
InitializeComponent();
@ -34,7 +32,7 @@ namespace Ryujinx.Ava.UI.Windows
PrimaryButtonText = string.Empty,
SecondaryButtonText = string.Empty,
CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
Content = new AboutWindow { ViewModel = viewModel }
Content = new AboutView { ViewModel = viewModel }
};
await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());

2
src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml → src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml
View File

@ -7,7 +7,7 @@
xmlns:ui="using:FluentAvalonia.UI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
x:Class="Ryujinx.Ava.UI.Views.Dialog.ApplicationDataView"
x:DataType="viewModels:ApplicationDataViewModel">
<StackPanel Orientation="Horizontal">
<Image Margin="0"

2
src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs → src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml.cs
View File

@ -12,7 +12,7 @@ using Ryujinx.Ava.Systems.AppLibrary;
using System.Linq;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Views.Misc
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
{

2
src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml → src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml
View File

@ -7,7 +7,7 @@
xmlns:models="using:Ryujinx.Ava.Common.Models"
xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
x:Class="Ryujinx.Ava.UI.Views.Dialog.DlcSelectView"
x:DataType="viewModels:DlcSelectViewModel">
<Grid RowDefinitions="*,Auto,*">
<TextBlock

2
src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml.cs → src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml.cs
View File

@ -9,7 +9,7 @@ using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Ava.Systems.AppLibrary;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Views.Misc
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
{

2
src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml → src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml
View File

@ -1,5 +1,5 @@
<UserControl
x:Class="Ryujinx.Ava.UI.Windows.DownloadableContentManagerWindow"
x:Class="Ryujinx.Ava.UI.Views.Dialog.DownloadableContentManagerView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

10
src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs → src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs
View File

@ -9,20 +9,20 @@ using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Common.Helper;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Windows
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class DownloadableContentManagerWindow : UserControl
public partial class DownloadableContentManagerView : UserControl
{
public DownloadableContentManagerViewModel ViewModel;
public DownloadableContentManagerWindow()
public DownloadableContentManagerView()
{
DataContext = this;
InitializeComponent();
}
public DownloadableContentManagerWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
public DownloadableContentManagerView(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
{
DataContext = ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData);
@ -36,7 +36,7 @@ namespace Ryujinx.Ava.UI.Windows
PrimaryButtonText = string.Empty,
SecondaryButtonText = string.Empty,
CloseButtonText = string.Empty,
Content = new DownloadableContentManagerWindow(applicationLibrary, applicationData),
Content = new DownloadableContentManagerView(applicationLibrary, applicationData),
Title = string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowTitle], applicationData.Name, applicationData.IdBaseString),
};

2
src/Ryujinx/UI/Windows/ModManagerWindow.axaml → src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml
View File

@ -10,7 +10,7 @@
Width="500"
Height="380"
mc:Ignorable="d"
x:Class="Ryujinx.Ava.UI.Windows.ModManagerWindow"
x:Class="Ryujinx.Ava.UI.Views.Dialog.ModManagerView"
x:CompileBindings="True"
x:DataType="viewModels:ModManagerViewModel"
Focusable="True">

10
src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs → src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs
View File

@ -11,20 +11,20 @@ using Ryujinx.Common.Helper;
using System.Threading.Tasks;
using Button = Avalonia.Controls.Button;
namespace Ryujinx.Ava.UI.Windows
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class ModManagerWindow : UserControl
public partial class ModManagerView : UserControl
{
public readonly ModManagerViewModel ViewModel;
public ModManagerWindow()
public ModManagerView()
{
DataContext = this;
InitializeComponent();
}
public ModManagerWindow(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary)
public ModManagerView(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary)
{
DataContext = ViewModel = new ModManagerViewModel(titleId, titleIdBase, applicationLibrary);
@ -38,7 +38,7 @@ namespace Ryujinx.Ava.UI.Windows
PrimaryButtonText = string.Empty,
SecondaryButtonText = string.Empty,
CloseButtonText = string.Empty,
Content = new ModManagerWindow(titleId, titleIdBase, appLibrary),
Content = new ModManagerView(titleId, titleIdBase, appLibrary),
Title = string.Format(LocaleManager.Instance[LocaleKeys.ModWindowTitle], titleName, titleId.ToString("X16")),
};

2
src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml → src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml
View File

@ -1,5 +1,5 @@
<UserControl
x:Class="Ryujinx.Ava.UI.Windows.TitleUpdateWindow"
x:Class="Ryujinx.Ava.UI.Views.Dialog.TitleUpdateManagerView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

10
src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml.cs → src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs
View File

@ -9,20 +9,20 @@ using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Common.Helper;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Windows
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class TitleUpdateWindow : UserControl
public partial class TitleUpdateManagerView : UserControl
{
public readonly TitleUpdateViewModel ViewModel;
public TitleUpdateWindow()
public TitleUpdateManagerView()
{
DataContext = this;
InitializeComponent();
}
public TitleUpdateWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
public TitleUpdateManagerView(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
{
DataContext = ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData);
@ -36,7 +36,7 @@ namespace Ryujinx.Ava.UI.Windows
PrimaryButtonText = string.Empty,
SecondaryButtonText = string.Empty,
CloseButtonText = string.Empty,
Content = new TitleUpdateWindow(applicationLibrary, applicationData),
Content = new TitleUpdateManagerView(applicationLibrary, applicationData),
Title = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.GameUpdateWindowHeading, applicationData.Name, applicationData.IdBaseString),
};

2
src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml → src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml
View File

@ -1,5 +1,5 @@
<UserControl
x:Class="Ryujinx.Ava.UI.Windows.XCITrimmerWindow"
x:Class="Ryujinx.Ava.UI.Views.Dialog.XciTrimmerView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

10
src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml.cs → src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs
View File

@ -8,20 +8,20 @@ using Ryujinx.Ava.UI.ViewModels;
using System;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Windows
namespace Ryujinx.Ava.UI.Views.Dialog
{
public partial class XCITrimmerWindow : UserControl
public partial class XciTrimmerView : UserControl
{
public XCITrimmerViewModel ViewModel;
public XCITrimmerWindow()
public XciTrimmerView()
{
DataContext = this;
InitializeComponent();
}
public XCITrimmerWindow(MainWindowViewModel mainWindowViewModel)
public XciTrimmerView(MainWindowViewModel mainWindowViewModel)
{
DataContext = ViewModel = new XCITrimmerViewModel(mainWindowViewModel);
@ -35,7 +35,7 @@ namespace Ryujinx.Ava.UI.Windows
PrimaryButtonText = string.Empty,
SecondaryButtonText = string.Empty,
CloseButtonText = string.Empty,
Content = new XCITrimmerWindow(RyujinxApp.MainWindow.ViewModel),
Content = new XciTrimmerView(RyujinxApp.MainWindow.ViewModel),
Title = LocaleManager.Instance[LocaleKeys.XCITrimmerWindowTitle]
};

6
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
View File

@ -13,7 +13,7 @@ using Ryujinx.Ava.UI.Windows;
using Ryujinx.Ava.Utilities;
using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.UI.Views.Misc;
using Ryujinx.Ava.UI.Views.Dialog;
using Ryujinx.Common;
using Ryujinx.Common.Helper;
using Ryujinx.Common.Utilities;
@ -46,8 +46,8 @@ namespace Ryujinx.Ava.UI.Views.Main
CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
XciTrimmerMenuItem.Command = Commands.Create(XciTrimmerView.Show);
AboutWindowMenuItem.Command = Commands.Create(AboutView.Show);
CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;