From 9c741930e85b4d512be64008dfd5222b85f80ad7 Mon Sep 17 00:00:00 2001 From: Martin Anderson Date: Tue, 23 Jul 2024 17:04:25 +0100 Subject: [PATCH 1/2] Clear layers on applying template --- src/Files.App.Controls/ThemedIcon/ThemedIcon.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs b/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs index a39cfb06d151..f522e0ef4c01 100644 --- a/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs +++ b/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs @@ -39,6 +39,12 @@ protected override void OnApplyTemplate() IsEnabledChanged -= OnIsEnabledChanged; SizeChanged -= OnSizeChanged; + if (GetTemplateChild(LayeredPathCanvas) is Canvas canvas) + { + canvas.Children.Clear(); + } + + base.OnApplyTemplate(); IsEnabledChanged += OnIsEnabledChanged; From caa2deab171b52d4a83c2252b5638e671b4f2f7a Mon Sep 17 00:00:00 2001 From: Martin Anderson Date: Tue, 23 Jul 2024 17:11:58 +0100 Subject: [PATCH 2/2] Moved out of OnApplyTemplate --- src/Files.App.Controls/ThemedIcon/ThemedIcon.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs b/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs index f522e0ef4c01..be5b0d031f22 100644 --- a/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs +++ b/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs @@ -39,12 +39,6 @@ protected override void OnApplyTemplate() IsEnabledChanged -= OnIsEnabledChanged; SizeChanged -= OnSizeChanged; - if (GetTemplateChild(LayeredPathCanvas) is Canvas canvas) - { - canvas.Children.Clear(); - } - - base.OnApplyTemplate(); IsEnabledChanged += OnIsEnabledChanged; @@ -91,6 +85,8 @@ private void UpdateLayeredIconContent() Layers is not ICollection layers) return; + canvas.Children.Clear(); + foreach (var layer in layers) { canvas.Children.Add(