Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-09-22 18:41:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add keybinds to useful things

Browse Source
This commit is contained in:
Evan Husted
2024-12-31 23:36:00 -06:00
committed by KeatonTheBot
parent 5ea895ed2e
commit e7e89efb3c
10 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
+18 -2
View File
@@ -30,7 +30,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private readonly string _amiiboJsonPath;
private readonly byte[] _amiiboLogoBytes;
private readonly HttpClient _httpClient;
private readonly StyleableWindow _owner;
private readonly AmiiboWindow _owner;
private Bitmap _amiiboImage;
private List<AmiiboApi> _amiiboList;
@@ -46,7 +46,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private static readonly AmiiboJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
public AmiiboWindowViewModel(StyleableWindow owner, string lastScannedAmiiboId, string titleId)
public AmiiboWindowViewModel(AmiiboWindow owner, string lastScannedAmiiboId, string titleId)
{
_owner = owner;
@@ -183,6 +183,22 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public void Scan()
{
if (AmiiboSelectedIndex > -1)
{
_owner.ScannedAmiibo = AmiiboList[AmiiboSelectedIndex];
_owner.IsScanned = true;
_owner.Close();
}
}
public void Cancel()
{
_owner.IsScanned = false;
_owner.Close();
}
public void Dispose()
{
GC.SuppressFinalize(this);
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+28 -4
View File
@@ -156,6 +156,8 @@ namespace Ryujinx.Ava.UI.ViewModels
public IEnumerable<LdnGameData> LastLdnGameData;
public MainWindow Window { get; init; }
internal AppHost AppHost { get; set; }
public MainWindowViewModel()
@@ -1782,7 +1784,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public async Task ExitCurrentState()
{
if (WindowState == WindowState.FullScreen)
if (WindowState == MainWindow.FullScreenWindowState)
{
ToggleFullscreen();
}
@@ -2097,6 +2099,28 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public async Task OpenAmiiboWindow()
{
if (!IsAmiiboRequested)
return;
if (AppHost.Device.System.SearchingForAmiibo(out int deviceId))
{
string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper();
AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId);
await window.ShowDialog(Window);
if (window.IsScanned)
{
ShowAll = window.ViewModel.ShowAllAmiibo;
LastScannedAmiiboId = window.ScannedAmiibo.GetId();
AppHost.Device.System.ScanAmiibo(deviceId, LastScannedAmiiboId, window.ViewModel.UseRandomUuid);
}
}
}
public void ToggleFullscreen()
{
@@ -2107,7 +2131,7 @@ namespace Ryujinx.Ava.UI.ViewModels
LastFullscreenToggle = Environment.TickCount64;
if (WindowState == WindowState.FullScreen)
if (WindowState is not WindowState.Normal)
{
WindowState = WindowState.Normal;
@@ -2118,7 +2142,7 @@ namespace Ryujinx.Ava.UI.ViewModels
}
else
{
WindowState = WindowState.FullScreen;
WindowState = MainWindow.FullScreenWindowState;
if (IsGameRunning)
{
@@ -2126,7 +2150,7 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
IsFullScreen = WindowState == WindowState.FullScreen;
IsFullScreen = WindowState == MainWindow.FullScreenWindowState;
}
public static void SaveConfig()