maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[FZ Editor] Update the small layout preview after canceling zone editing. (#9391)

Browse source
This commit is contained in:
Seraphima Zykova 2021-02-02 11:15:05 +03:00 committed by GitHub
parent f309f48ae2
commit 612f3e20ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules/fancyzones/editor/FancyZonesEditor/EditorWindow.cs
View file

@ -31,25 +31,17 @@ namespace FancyZonesEditor
App.FancyZonesEditorIO.SerializeZoneSettings();
_backToLayoutPicker = false;
Close();
mainEditor.CloseEditor();
}
protected void OnClosed(object sender, EventArgs e)
{
if (_backToLayoutPicker)
{
App.Overlay.CloseEditor();
}
App.Overlay.CloseEditor();
}
protected void OnCancel(object sender, RoutedEventArgs e)
{
_backToLayoutPicker = true;
Close();
}
private bool _backToLayoutPicker = true;
}
}

6
src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs
View file

@ -91,6 +91,10 @@ namespace FancyZonesEditor.Models
{
_topLeft = DefaultOffset;
}
else if (_topLeft == Zones[Zones.Count - 1].X)
{
_topLeft += OffsetShift;
}
Rect workingArea = App.Overlay.WorkArea;
int topLeft = (int)App.Overlay.ScaleCoordinateWithCurrentMonitorDpi(_topLeft);
@ -155,7 +159,9 @@ namespace FancyZonesEditor.Models
other.Zones.Add(zone);
}
other._topLeft = _topLeft;
other.SensitivityRadius = SensitivityRadius;
other.UpdateLayout();
}
// PersistData

2
src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs
View file

@ -263,6 +263,8 @@ namespace FancyZonesEditor.Models
layout.ShowSpacing = ShowSpacing;
layout.Spacing = Spacing;
layout.SensitivityRadius = SensitivityRadius;
layout.FirePropertyChanged();
}
// InitTemplateZones