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

[FancyZones Editor] Crash when changing between zone layouts: refactoring (#12815)

Browse Source
This commit is contained in:
Seraphima Zykova
2021-08-23 18:20:04 +03:00
committed by GitHub
parent cea9b35319
commit e70994f121
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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