diff options
author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2022-11-29 06:33:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-29 06:33:46 +0100 |
commit | fbf2b09706a55856c76aaf9051007eedf1f4b0ab (patch) | |
tree | ed2ef0cb5f34762f1d829c5055a728ae4567078b | |
parent | 1fc0f569de518581761ab2f4b751b0dbaf2cd279 (diff) |
ava: Make dialogs using an overlay window work on Linux (#3938)1.1.396
-rw-r--r-- | Ryujinx.Ava/Ryujinx.Ava.csproj | 2 | ||||
-rw-r--r-- | Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index c851b4513..9818914cf 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj | |||
@@ -27,7 +27,7 @@ | |||
27 | <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.18" /> | 27 | <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.18" /> |
28 | <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" /> | 28 | <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" /> |
29 | <PackageReference Include="DynamicData" Version="7.12.8" /> | 29 | <PackageReference Include="DynamicData" Version="7.12.8" /> |
30 | <PackageReference Include="FluentAvaloniaUI" Version="1.4.4" /> | 30 | <PackageReference Include="FluentAvaloniaUI" Version="1.4.5" /> |
31 | <PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" /> | 31 | <PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" /> |
32 | 32 | ||
33 | <PackageReference Include="OpenTK.Core" Version="4.7.2" /> | 33 | <PackageReference Include="OpenTK.Core" Version="4.7.2" /> |
diff --git a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs index 9fcc2d2ec..9cf4231c5 100644 --- a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs +++ b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs | |||
@@ -127,9 +127,16 @@ namespace Ryujinx.Ava.Ui.Controls | |||
127 | contentDialog.PrimaryButtonClick += deferCloseAction; | 127 | contentDialog.PrimaryButtonClick += deferCloseAction; |
128 | } | 128 | } |
129 | 129 | ||
130 | await contentDialog.ShowAsync(ContentDialogPlacement.Popup); | 130 | if (useOverlay) |
131 | { | ||
132 | await contentDialog.ShowAsync(overlay, ContentDialogPlacement.Popup); | ||
131 | 133 | ||
132 | overlay?.Close(); | 134 | overlay!.Close(); |
135 | } | ||
136 | else | ||
137 | { | ||
138 | await contentDialog.ShowAsync(ContentDialogPlacement.Popup); | ||
139 | } | ||
133 | } | 140 | } |
134 | 141 | ||
135 | if (useOverlay) | 142 | if (useOverlay) |
@@ -391,4 +398,4 @@ namespace Ryujinx.Ava.Ui.Controls | |||
391 | return string.Empty; | 398 | return string.Empty; |
392 | } | 399 | } |
393 | } | 400 | } |
394 | } | 401 | } \ No newline at end of file |