mirror of
https://github.com/GreemDev/Ryujinx
synced 2024-11-22 17:56:59 +01:00
eeb2af9953
* Fix redundancies * Add back elses * `MainWindow` Refactor * Switch commands to `ReflectionBinding` Not required in Ava 11 * Update Ryujinx.Ava/AppHost.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/AppHost.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/AppHost.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/AppHost.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/AppHost.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/AppHost.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Resolve issues * Remove Ava 11 Fix * Update Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Update Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Fix whitespace + other suggestions * Move Vsync colours to `Styles.xaml` * Remove catch all * Use `switch` instead of `if` * Update locale keys * Use block-scoped namespaces * Fix improper Ava api usage then * Static PTC * Fix `GridItemSelectorSize` with `ShowNames` * Update for new About Window * Add back search fix Co-authored-by: Ac_K <Acoustik666@gmail.com> Co-authored-by: gdkchan <gab.dark.100@gmail.com>
198 lines
No EOL
6.6 KiB
C#
198 lines
No EOL
6.6 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 playerCount = args.PlayerCountMin == args.PlayerCountMax
|
|
? args.PlayerCountMin.ToString()
|
|
: $"{args.PlayerCountMin}-{args.PlayerCountMax}";
|
|
|
|
LocaleKeys key = args.PlayerCountMin == args.PlayerCountMax ? LocaleKeys.DialogControllerAppletMessage : LocaleKeys.DialogControllerAppletMessagePlayerRange;
|
|
|
|
string message = string.Format(LocaleManager.Instance[key],
|
|
playerCount,
|
|
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;
|
|
|
|
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(string.Format(LocaleManager.Instance[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(_parent, LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args);
|
|
|
|
if (response.Result == UserResult.Ok)
|
|
{
|
|
inputText = response.Input;
|
|
okPressed = true;
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
error = true;
|
|
await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance[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);
|
|
if (_parent.ViewModel.AppHost != null)
|
|
{
|
|
_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(string.Format(LocaleManager.Instance[LocaleKeys.DialogErrorAppletErrorExceptionMessage], ex));
|
|
}
|
|
});
|
|
|
|
dialogCloseEvent.WaitOne();
|
|
|
|
return showDetails;
|
|
}
|
|
|
|
public IDynamicTextInputHandler CreateDynamicTextInputHandler()
|
|
{
|
|
return new AvaloniaDynamicTextInputHandler(_parent);
|
|
}
|
|
}
|
|
} |