mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-10-02 16:50:20 -07:00

* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address dotnet format CA1401 warnings * Address remaining dotnet format analyzer warnings * Address review comments * dotnet-format fixes after rebase * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Another rebase, another dotnet format run * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Address IDE0260 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * dotnet format pass with new editorconfig * Fix naming style issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Revert one suggestion * Second dotnet format pass and fix build issues * Final pass of dotnet format * Add trailing commas * Fix formatting issues * Keep unnecessary assignment in IconColorPicker.cs * Use using declarations and extend resource lifetimes * Fix rebase issues * Adjust comment spacing * Fix typo * Fix naming issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Revert unintentional change * Remove unused file * Remove static keyword from ViewModels Binding of static members doesn't work and is silently ignored. --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
195 lines
6.4 KiB
C#
195 lines
6.4 KiB
C#
using Avalonia.Controls;
|
|
using Avalonia.Threading;
|
|
using FluentAvalonia.UI.Controls;
|
|
using Ryujinx.Ava.Common.Locale;
|
|
using Ryujinx.Ava.UI.Controls;
|
|
using Ryujinx.Ava.UI.Helpers;
|
|
using Ryujinx.Ava.UI.Windows;
|
|
using Ryujinx.HLE;
|
|
using Ryujinx.HLE.HOS.Applets;
|
|
using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
|
|
using Ryujinx.HLE.Ui;
|
|
using System;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.Ava.UI.Applet
|
|
{
|
|
internal class AvaHostUiHandler : IHostUiHandler
|
|
{
|
|
private readonly MainWindow _parent;
|
|
|
|
public IHostUiTheme HostUiTheme { get; }
|
|
|
|
public AvaHostUiHandler(MainWindow parent)
|
|
{
|
|
_parent = parent;
|
|
|
|
HostUiTheme = new AvaloniaHostUiTheme(parent);
|
|
}
|
|
|
|
public bool DisplayMessageDialog(ControllerAppletUiArgs args)
|
|
{
|
|
string message = LocaleManager.Instance.UpdateAndGetDynamicValue(
|
|
args.PlayerCountMin == args.PlayerCountMax ? LocaleKeys.DialogControllerAppletMessage : LocaleKeys.DialogControllerAppletMessagePlayerRange,
|
|
args.PlayerCountMin == args.PlayerCountMax ? args.PlayerCountMin.ToString() : $"{args.PlayerCountMin}-{args.PlayerCountMax}",
|
|
args.SupportedStyles,
|
|
string.Join(", ", args.SupportedPlayers),
|
|
args.IsDocked ? LocaleManager.Instance[LocaleKeys.DialogControllerAppletDockModeSet] : "");
|
|
|
|
return DisplayMessageDialog(LocaleManager.Instance[LocaleKeys.DialogControllerAppletTitle], message);
|
|
}
|
|
|
|
public bool DisplayMessageDialog(string title, string message)
|
|
{
|
|
ManualResetEvent dialogCloseEvent = new(false);
|
|
|
|
bool okPressed = false;
|
|
|
|
Dispatcher.UIThread.InvokeAsync(async () =>
|
|
{
|
|
try
|
|
{
|
|
ManualResetEvent deferEvent = new(false);
|
|
|
|
bool opened = false;
|
|
|
|
_parent.Activate();
|
|
|
|
UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent,
|
|
title,
|
|
message,
|
|
"",
|
|
LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel],
|
|
"",
|
|
LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
|
|
(int)Symbol.Important,
|
|
deferEvent,
|
|
async window =>
|
|
{
|
|
if (opened)
|
|
{
|
|
return;
|
|
}
|
|
|
|
opened = true;
|
|
|
|
_parent.SettingsWindow = new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager);
|
|
|
|
await _parent.SettingsWindow.ShowDialog(window);
|
|
|
|
opened = false;
|
|
});
|
|
|
|
if (response == UserResult.Ok)
|
|
{
|
|
okPressed = true;
|
|
}
|
|
|
|
dialogCloseEvent.Set();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogMessageDialogErrorExceptionMessage, ex));
|
|
|
|
dialogCloseEvent.Set();
|
|
}
|
|
});
|
|
|
|
dialogCloseEvent.WaitOne();
|
|
|
|
return okPressed;
|
|
}
|
|
|
|
public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
|
|
{
|
|
ManualResetEvent dialogCloseEvent = new(false);
|
|
|
|
bool okPressed = false;
|
|
bool error = false;
|
|
string inputText = args.InitialText ?? "";
|
|
|
|
Dispatcher.UIThread.Post(async () =>
|
|
{
|
|
try
|
|
{
|
|
var response = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args);
|
|
|
|
if (response.Result == UserResult.Ok)
|
|
{
|
|
inputText = response.Input;
|
|
okPressed = true;
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
error = true;
|
|
|
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogSoftwareKeyboardErrorExceptionMessage, ex));
|
|
}
|
|
finally
|
|
{
|
|
dialogCloseEvent.Set();
|
|
}
|
|
});
|
|
|
|
dialogCloseEvent.WaitOne();
|
|
|
|
userText = error ? null : inputText;
|
|
|
|
return error || okPressed;
|
|
}
|
|
|
|
public void ExecuteProgram(Switch device, ProgramSpecifyKind kind, ulong value)
|
|
{
|
|
device.Configuration.UserChannelPersistence.ExecuteProgram(kind, value);
|
|
_parent.ViewModel.AppHost?.Stop();
|
|
}
|
|
|
|
public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)
|
|
{
|
|
ManualResetEvent dialogCloseEvent = new(false);
|
|
|
|
bool showDetails = false;
|
|
|
|
Dispatcher.UIThread.Post(async () =>
|
|
{
|
|
try
|
|
{
|
|
ErrorAppletWindow msgDialog = new(_parent, buttons, message)
|
|
{
|
|
Title = title,
|
|
WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
|
Width = 400,
|
|
};
|
|
|
|
object response = await msgDialog.Run();
|
|
|
|
if (response != null && buttons != null && buttons.Length > 1 && (int)response != buttons.Length - 1)
|
|
{
|
|
showDetails = true;
|
|
}
|
|
|
|
dialogCloseEvent.Set();
|
|
|
|
msgDialog.Close();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
dialogCloseEvent.Set();
|
|
|
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogErrorAppletErrorExceptionMessage, ex));
|
|
}
|
|
});
|
|
|
|
dialogCloseEvent.WaitOne();
|
|
|
|
return showDetails;
|
|
}
|
|
|
|
public IDynamicTextInputHandler CreateDynamicTextInputHandler()
|
|
{
|
|
return new AvaloniaDynamicTextInputHandler(_parent);
|
|
}
|
|
}
|
|
}
|