ava: Make dialogs using an overlay window work on Linux (#3938)

2022-11-29 06:33:46 +01:00
parent 1fc0f569de
commit fbf2b09706
2 changed files with 11 additions and 4 deletions
--- a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
+++ b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
@@ -127,9 +127,16 @@ namespace Ryujinx.Ava.Ui.Controls
                    contentDialog.PrimaryButtonClick += deferCloseAction;
                }

-                await contentDialog.ShowAsync(ContentDialogPlacement.Popup);
+                if (useOverlay)
+                {
+                    await contentDialog.ShowAsync(overlay, ContentDialogPlacement.Popup);

-                overlay?.Close();
+                    overlay!.Close();
+                }
+                else
+                {
+                    await contentDialog.ShowAsync(ContentDialogPlacement.Popup);
+                }
            }

            if (useOverlay)
@@ -391,4 +398,4 @@ namespace Ryujinx.Ava.Ui.Controls
            return string.Empty;
        }
    }
-}
+}