Merge branch 'develop'

fluentribbon · Jan 23, 2022 · a65f749 · a65f749
2 parents f525132 + 0af641b
commit a65f749
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog for Fluent.Ribbon
 
+## 9.0.2
+
+- ### Bug fixes
+
+  - [#999](../../issues/999) - Window object not being recycled after ribbon window is closed
+
 ## 9.0.1
 
 - ### Bug fixes

diff --git a/Fluent.Ribbon/Controls/IconPresenter.cs b/Fluent.Ribbon/Controls/IconPresenter.cs
@@ -1,4 +1,5 @@
 #pragma warning disable 1591, WPF0012, WPF0023
+// ReSharper disable once CheckNamespace
 namespace Fluent
 {
     using System;
@@ -53,8 +54,7 @@ public class IconPresenter : ContentControl
         public static readonly DependencyProperty CurrentIconSizeSizeProperty = DependencyProperty.Register(
             nameof(CurrentIconSizeSize), typeof(Size), typeof(IconPresenter), new PropertyMetadata(new Size(16, 16)));
 
-        [ThreadStatic]
-        private static GrayscaleEffect? grayscaleEffect;
+        private GrayscaleEffect? grayscaleEffect;
 
         static IconPresenter()
         {
@@ -65,8 +65,6 @@ static IconPresenter()
 
         public IconPresenter()
         {
-            grayscaleEffect ??= new GrayscaleEffect();
-
             var multiBinding = new MultiBinding { Converter = StaticConverters.ObjectToImageConverter };
             multiBinding.Bindings.Add(new Binding(nameof(this.OptimalIcon)) { Source = this });
             multiBinding.Bindings.Add(new Binding(nameof(this.CurrentIconSizeSize)) { Source = this });
@@ -144,7 +142,7 @@ private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyCha
 
             control.Effect = newValue
                 ? null
-                : grayscaleEffect;
+                : control.grayscaleEffect ??= new GrayscaleEffect();
             control.Opacity = newValue
                 ? 1
                 : 0.5;