Merge pull request #83 from boelew/develop/FixDispatcherProblems

Fix dispatcher problems
whistyun · Jan 22, 2024 · 0b190df · 0b190df
2 parents d58819c + 4110f36
commit 0b190df
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/MdXaml/ImageLoaderManager.cs b/MdXaml/ImageLoaderManager.cs
@@ -104,7 +104,7 @@ private static async Task<Result<Stream>> OpenStreamAsync(Uri resourceUrl)
             {
                 case "http":
                 case "https":
-                    var httpResult = await s_client.GetAsync(resourceUrl);
+                    var httpResult = await s_client.GetAsync(resourceUrl).ConfigureAwait(false);
                     if (httpResult.StatusCode == HttpStatusCode.OK)
                     {
                         var webstream = await httpResult.Content.ReadAsStreamAsync();

diff --git a/MdXaml/MarkdownScrollViewer.cs b/MdXaml/MarkdownScrollViewer.cs
@@ -59,10 +59,10 @@ public class MarkdownScrollViewer : FlowDocumentScrollViewer, IUriContext
 
         public static readonly DependencyProperty MarkdownStyleNameProperty =
             DependencyProperty.Register(
-            nameof(MarkdownStyleName),
-            typeof(string),
-            typeof(MarkdownScrollViewer),
-            new PropertyMetadata(nameof(MdStyle.Standard), UpdateStyleName));
+                nameof(MarkdownStyleName),
+                typeof(string),
+                typeof(MarkdownScrollViewer),
+                new PropertyMetadata(nameof(MdStyle.Standard), UpdateStyleName));
 
         public static readonly DependencyProperty AssetPathRootProperty =
             DependencyProperty.Register(
@@ -71,6 +71,13 @@ public class MarkdownScrollViewer : FlowDocumentScrollViewer, IUriContext
                 typeof(MarkdownScrollViewer),
                 new PropertyMetadata(null, UpdateAssetPathRoot));
 
+        public static readonly DependencyProperty DisabledLazyLoadProperty =
+            DependencyProperty.Register(
+                nameof(DisabledLazyLoad),
+                typeof(bool),
+                typeof(MarkdownScrollViewer),
+                new PropertyMetadata(false, UpdateDisabledLazyLoad));
+
 
         private static void UpdateSource(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
@@ -163,6 +170,18 @@ private static void UpdateAssetPathRoot(DependencyObject d, DependencyPropertyCh
             }
         }
 
+        private static void UpdateDisabledLazyLoad(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if(d is MarkdownScrollViewer owner)
+            {
+                var disabledLazyLoad = (bool)e.NewValue;
+                if (disabledLazyLoad != owner.Engine.DisabledLazyLoad)
+                {
+                  owner.Engine.DisabledLazyLoad = (bool)e.NewValue;
+                }
+            }
+        }
+
         private string _fragment;
         private Uri _source;
 
@@ -305,6 +324,12 @@ public string MarkdownStyleName
             set { SetValue(MarkdownStyleNameProperty, value); }
         }
 
+        public bool DisabledLazyLoad
+        {
+          get { return (bool)GetValue(DisabledLazyLoadProperty); }
+          set { SetValue(DisabledLazyLoadProperty, value); }
+        }
+
         public Uri? Source
         {
             get { return (Uri)GetValue(SourceProperty); }