Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[FZE] Fix crash when double clicking edit layout (#12609)

Browse Source
This commit is contained in:
Jaime Bernardo
2021-08-04 15:23:28 +01:00
committed by GitHub
parent 7751fed39e
commit 37e130a1a8
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View File

@@ -26,6 +26,7 @@ namespace FancyZonesEditor
private LayoutModel _backup; private LayoutModel _backup;
private ContentDialog _openedDialog; private ContentDialog _openedDialog;
private bool _openingDialog = false; // Is the dialog being opened.
public int WrapPanelItemSize { get; set; } = DefaultWrapPanelItemSize; public int WrapPanelItemSize { get; set; } = DefaultWrapPanelItemSize;
@@ -247,19 +248,32 @@ namespace FancyZonesEditor
private async void EditLayout_Click(object sender, RoutedEventArgs e) private async void EditLayout_Click(object sender, RoutedEventArgs e)
{ {
var dataContext = ((FrameworkElement)sender).DataContext; // Avoid trying to open the same dialog twice.
Select((LayoutModel)dataContext); if (!_openingDialog)
if (_settings.SelectedModel is GridLayoutModel grid)
{ {
_backup = new GridLayoutModel(grid); _openingDialog = true;
} try
else if (_settings.SelectedModel is CanvasLayoutModel canvas) {
{ var dataContext = ((FrameworkElement)sender).DataContext;
_backup = new CanvasLayoutModel(canvas); Select((LayoutModel)dataContext);
}
await EditLayoutDialog.ShowAsync(); if (_settings.SelectedModel is GridLayoutModel grid)
{
_backup = new GridLayoutModel(grid);
}
else if (_settings.SelectedModel is CanvasLayoutModel canvas)
{
_backup = new CanvasLayoutModel(canvas);
}
await EditLayoutDialog.ShowAsync();
}
catch
{
_openingDialog = false;
throw;
}
}
} }
private void EditZones_Click(object sender, RoutedEventArgs e) private void EditZones_Click(object sender, RoutedEventArgs e)
@@ -411,6 +425,7 @@ namespace FancyZonesEditor
private void Dialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args) private void Dialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args)
{ {
_openingDialog = false;
_openedDialog = null; _openedDialog = null;
} }