N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ava UI: Remove IsActive checks from dialog methods (#5456)

Browse source 
* Remove `IsActive` checks from dialog methods

* Remove old windows bandaid

* Remove null dialog code path entirely and return nothing.
This commit is contained in:
MutantAura 2023-07-21 12:24:13 +01:00 committed by GitHub
parent 4cf2419e6c
commit 9e04e6cba1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs
View file

@ -53,8 +53,6 @@ namespace Ryujinx.Ava.UI.Applet
bool opened = false; bool opened = false;
_parent.Activate();
UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent, UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent,
title, title,
message, message,

10
src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs
View file

@ -315,8 +315,10 @@ namespace Ryujinx.Ava.UI.Helpers
Window parent = GetMainWindow(); Window parent = GetMainWindow();
if (parent is { IsActive: true } and MainWindow window && window.ViewModel.IsGameRunning) if (parent is MainWindow window && window.ViewModel.IsGameRunning)
{ {
parent.Activate();
contentDialogOverlayWindow = new() contentDialogOverlayWindow = new()
{ {
Height = parent.Bounds.Height, Height = parent.Bounds.Height,
@ -369,7 +371,9 @@ namespace Ryujinx.Ava.UI.Helpers
} }
else else
{ {
result = await contentDialog.ShowAsync(); result = ContentDialogResult.None;
Logger.Warning?.Print(LogClass.Ui, "Content dialog overlay failed to populate. Default value has been returned.");
} }
return result; return result;
@ -390,7 +394,7 @@ namespace Ryujinx.Ava.UI.Helpers
{ {
foreach (Window item in al.Windows) foreach (Window item in al.Windows)
{ {
if (item.IsActive && item is MainWindow window) if (item is MainWindow window)
{ {
return window; return window;
} }