fix a memory leak. refs #80

whistyun · Jan 4, 2024 · 8d86aba · 8d86aba
1 parent 52963b8
commit 8d86aba
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/MdXaml/MarkdownScrollViewer.cs b/MdXaml/MarkdownScrollViewer.cs
@@ -375,12 +375,23 @@ public MarkdownScrollViewer()
             ContextMenu = menu;
 
 
-            DependencyPropertyDescriptor
-                .FromProperty(FlowDocumentScrollViewer.DocumentProperty, typeof(FlowDocumentScrollViewer))
-                .AddValueChanged(this, OnDocumentChanged);
+            // Do not use DependencyPropertyDescriptor. This may cause memory leaks if used with low understanding.
+            // 
+            // DependencyPropertyDescriptor
+            //     .FromProperty(FlowDocumentScrollViewer.DocumentProperty, typeof(FlowDocumentScrollViewer))
+            //     .AddValueChanged(this, OnDocumentChanged);
         }
 
-        private void OnDocumentChanged(object sender, EventArgs handler)
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+
+            if (e.Property == FlowDocumentScrollViewer.DocumentProperty) 
+                OnDocumentChanged();
+        }
+
+
+        private void OnDocumentChanged()
         {
             if (Document is not null)
                 ScrollTo(Fragment, false);