Mirror/Ryujinx
3
5
Fork 13
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-20 00:06:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid using overlay window when not necessary

Browse source
This commit is contained in:
Isaac Marovitz 2024-07-20 12:33:19 +01:00
parent 5ad5679145
commit f0f84454a8
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
1 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
View file

@ -342,49 +342,56 @@ namespace Ryujinx.Ava.UI.Helpers
isTopDialog = false;
}
parent.Activate();
_contentDialogOverlayWindow = new ContentDialogOverlayWindow
if (parent is MainWindow)
{
Height = parent.Bounds.Height,
Width = parent.Bounds.Width,
Position = parent.PointToScreen(new Point()),
ShowInTaskbar = false,
};
parent.Activate();
parent.PositionChanged += OverlayOnPositionChanged;
void OverlayOnPositionChanged(object sender, PixelPointEventArgs e)
{
if (_contentDialogOverlayWindow is null)
_contentDialogOverlayWindow = new ContentDialogOverlayWindow
{
return;
Height = parent.Bounds.Height,
Width = parent.Bounds.Width,
Position = parent.PointToScreen(new Point()),
ShowInTaskbar = false,
};
parent.PositionChanged += OverlayOnPositionChanged;
void OverlayOnPositionChanged(object sender, PixelPointEventArgs e)
{
if (_contentDialogOverlayWindow is null)
{
return;
}
_contentDialogOverlayWindow.Position = parent.PointToScreen(new Point());
}
_contentDialogOverlayWindow.Position = parent.PointToScreen(new Point());
}
_contentDialogOverlayWindow.ContentDialog = contentDialog;
_contentDialogOverlayWindow.ContentDialog = contentDialog;
bool opened = false;
bool opened = false;
_contentDialogOverlayWindow.Opened += OverlayOnActivated;
_contentDialogOverlayWindow.Opened += OverlayOnActivated;
async void OverlayOnActivated(object sender, EventArgs e)
{
if (opened)
async void OverlayOnActivated(object sender, EventArgs e)
{
return;
if (opened)
{
return;
}
opened = true;
_contentDialogOverlayWindow.Position = parent.PointToScreen(new Point());
result = await ShowDialog();
}
opened = true;
_contentDialogOverlayWindow.Position = parent.PointToScreen(new Point());
result = await ShowDialog();
result = await _contentDialogOverlayWindow.ShowDialog<ContentDialogResult>(parent);
}
else
{
result = await contentDialog.ShowAsync(parent);
}
result = await _contentDialogOverlayWindow.ShowDialog<ContentDialogResult>(parent);
async Task<ContentDialogResult> ShowDialog()
{