deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
TSRBerry 2022-11-29 06:33:46 +01:00 committed by GitHub
parent 1fc0f569de
commit fbf2b09706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Ava/Ryujinx.Ava.csproj
View file

@ -27,7 +27,7 @@
<PackageReference Include="Avalonia.Svg.Skia" Version="0.10.18" /> <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.18" />
<PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" /> <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" />
<PackageReference Include="DynamicData" Version="7.12.8" /> <PackageReference Include="DynamicData" Version="7.12.8" />
<PackageReference Include="FluentAvaloniaUI" Version="1.4.4" /> <PackageReference Include="FluentAvaloniaUI" Version="1.4.5" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" /> <PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" />
<PackageReference Include="OpenTK.Core" Version="4.7.2" /> <PackageReference Include="OpenTK.Core" Version="4.7.2" />

13
Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
View file

@ -127,9 +127,16 @@ namespace Ryujinx.Ava.Ui.Controls
contentDialog.PrimaryButtonClick += deferCloseAction; 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) if (useOverlay)
@ -391,4 +398,4 @@ namespace Ryujinx.Ava.Ui.Controls
return string.Empty; return string.Empty;
} }
} }
} }