diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-04-16 09:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-16 07:09:02 +0000 |
| commit | 6dbcdfea47e60aadefd59a75e43549793481f853 (patch) | |
| tree | 84122acbd9faffca6894f32a69e108edcf0fba9a /Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs | |
| parent | c5258cf082b10f335f81487f22b7eeb86075e09e (diff) | |
Ava: Fix nca extraction window never closing & minor cleanup (#4569)1.1.712
* ava: Remove unused doWhileDeferred parameters
* ava: Minimally improve swkbd dialog
It's currently impossible to get the dialog to redirect focus to the InputBox.
* ava: Fix nca extraction dialog never closing
Also contains some minor cleanup
Diffstat (limited to 'Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs')
| -rw-r--r-- | Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs b/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs index 8f0c670e..cb474506 100644 --- a/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs +++ b/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs @@ -27,7 +27,6 @@ namespace Ryujinx.Ava.UI.Helpers string closeButton, UserResult primaryButtonResult = UserResult.Ok, ManualResetEvent deferResetEvent = null, - Func<Window, Task> doWhileDeferred = null, TypedEventHandler<ContentDialog, ContentDialogButtonClickEventArgs> deferCloseAction = null) { UserResult result = UserResult.None; @@ -78,12 +77,11 @@ namespace Ryujinx.Ava.UI.Helpers int iconSymbol, UserResult primaryButtonResult = UserResult.Ok, ManualResetEvent deferResetEvent = null, - Func<Window, Task> doWhileDeferred = null, TypedEventHandler<ContentDialog, ContentDialogButtonClickEventArgs> deferCloseAction = null) { Grid content = CreateTextDialogContent(primaryText, secondaryText, iconSymbol); - return await ShowContentDialog(title, content, primaryButton, secondaryButton, closeButton, primaryButtonResult, deferResetEvent, doWhileDeferred, deferCloseAction); + return await ShowContentDialog(title, content, primaryButton, secondaryButton, closeButton, primaryButtonResult, deferResetEvent, deferCloseAction); } public async static Task<UserResult> ShowDeferredContentDialog( @@ -111,7 +109,6 @@ namespace Ryujinx.Ava.UI.Helpers iconSymbol, primaryButton == LocaleManager.Instance[LocaleKeys.InputDialogYes] ? UserResult.Yes : UserResult.Ok, deferResetEvent, - doWhileDeferred, DeferClose); async void DeferClose(ContentDialog sender, ContentDialogButtonClickEventArgs args) @@ -236,11 +233,6 @@ namespace Ryujinx.Ava.UI.Helpers primaryButtonResult); } - internal static UpdateWaitWindow CreateWaitingDialog(string mainText, string secondaryText) - { - return new(mainText, secondaryText); - } - internal static async Task CreateUpdaterInfoDialog(string primary, string secondaryText) { await ShowTextDialog( @@ -319,28 +311,6 @@ namespace Ryujinx.Ava.UI.Helpers LocaleManager.Instance[LocaleKeys.DialogExitSubMessage]); } - internal static async Task<string> CreateInputDialog( - string title, - string mainText, - string subText, - uint maxLength = int.MaxValue, - string input = "") - { - var result = await InputDialog.ShowInputDialog( - title, - mainText, - input, - subText, - maxLength); - - if (result.Result == UserResult.Ok) - { - return result.Input; - } - - return string.Empty; - } - public static async Task<ContentDialogResult> ShowAsync(ContentDialog contentDialog) { ContentDialogResult result; |