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

[FancyZones Editor] Fix layout selection after deleting custom (#28219)

Browse Source
This commit is contained in:
Seraphima Zykova
2023-08-30 17:24:19 +03:00
committed by GitHub
parent 657e9915ac
commit 25e346db92
1 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs
View File

@@ -1019,6 +1019,45 @@ namespace FancyZonesEditor.Utils
continue; continue;
} }
LayoutType layoutType = JsonTagToLayoutType(layout.AppliedLayout.Type);
LayoutSettings settings = new LayoutSettings
{
ZonesetUuid = layout.AppliedLayout.Uuid,
ShowSpacing = layout.AppliedLayout.ShowSpacing,
Spacing = layout.AppliedLayout.Spacing,
Type = layoutType,
ZoneCount = layout.AppliedLayout.ZoneCount,
SensitivityRadius = layout.AppliedLayout.SensitivityRadius,
};
// check if the custom layout exists
bool existingLayout = layoutType != LayoutType.Custom;
if (layoutType == LayoutType.Custom)
{
foreach (LayoutModel custom in MainWindowSettingsModel.CustomModels)
{
if (custom.Uuid == layout.AppliedLayout.Uuid)
{
existingLayout = true;
break;
}
}
}
// replace deleted layout with the Blank layout
if (!existingLayout)
{
LayoutModel blankLayout = MainWindowSettingsModel.TemplateModels[(int)LayoutType.Blank];
settings.ZonesetUuid = blankLayout.Uuid;
settings.Type = blankLayout.Type;
settings.ZoneCount = blankLayout.TemplateZoneCount;
settings.SensitivityRadius = blankLayout.SensitivityRadius;
// grid layout settings, just resetting them
settings.ShowSpacing = false;
settings.Spacing = 0;
}
bool unused = true; bool unused = true;
foreach (Monitor monitor in monitors) foreach (Monitor monitor in monitors)
{ {
@@ -1028,16 +1067,6 @@ namespace FancyZonesEditor.Utils
(monitor.Device.VirtualDesktopId == layout.Device.VirtualDesktop || (monitor.Device.VirtualDesktopId == layout.Device.VirtualDesktop ||
layout.Device.VirtualDesktop == DefaultVirtualDesktopGuid)) layout.Device.VirtualDesktop == DefaultVirtualDesktopGuid))
{ {
var settings = new LayoutSettings
{
ZonesetUuid = layout.AppliedLayout.Uuid,
ShowSpacing = layout.AppliedLayout.ShowSpacing,
Spacing = layout.AppliedLayout.Spacing,
Type = JsonTagToLayoutType(layout.AppliedLayout.Type),
ZoneCount = layout.AppliedLayout.ZoneCount,
SensitivityRadius = layout.AppliedLayout.SensitivityRadius,
};
monitor.Settings = settings; monitor.Settings = settings;
unused = false; unused = false;
break; break;