From c0d5f3622495d21872e2c649d992f173da646cf6 Mon Sep 17 00:00:00 2001 From: Seraphima Zykova Date: Mon, 29 Aug 2022 20:18:00 +0200 Subject: [PATCH] [FZEditor] Canvas layout width/height resize fix (#20099) --- .../fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml.cs | 1 - .../editor/FancyZonesEditor/LayoutPreview.xaml.cs | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml.cs index e3c6179eaa..6dc0f7e0ac 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml.cs @@ -53,7 +53,6 @@ namespace FancyZonesEditor _model = model; var workArea = App.Overlay.WorkArea; - _model.ScaleLayout(workAreaWidth: workArea.Width, workAreaHeight: workArea.Height); UpdateZoneRects(); diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml.cs index fc65fd9dbc..0cd803af67 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml.cs @@ -264,7 +264,9 @@ namespace FancyZonesEditor private void RenderCanvasPreview(CanvasLayoutModel canvas) { var screenWorkArea = App.Overlay.WorkArea; - canvas.ScaleLayout(workAreaWidth: screenWorkArea.Width, workAreaHeight: screenWorkArea.Height); + + var renderLayout = (CanvasLayoutModel)canvas.Clone(); + renderLayout.ScaleLayout(workAreaWidth: screenWorkArea.Width, workAreaHeight: screenWorkArea.Height); Viewbox viewbox = new Viewbox { @@ -278,7 +280,7 @@ namespace FancyZonesEditor }; viewbox.Child = frame; - foreach (Int32Rect zone in canvas.Zones) + foreach (Int32Rect zone in renderLayout.Zones) { Border rect = new Border(); Canvas.SetTop(rect, zone.Y);