Merge pull request #35 from whistyun/fixstyleset

Setting a value to MarkdownStyle has no effect with DataTemplate.
whistyun · May 14, 2022 · e03f57b · e03f57b
2 parents 5802e96 + c53449f
commit e03f57b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/MdXaml/MarkdownScrollViewer.cs b/MdXaml/MarkdownScrollViewer.cs
@@ -47,14 +47,14 @@ public class MarkdownScrollViewer : FlowDocumentScrollViewer, IUriContext
                 nameof(MarkdownStyle),
                 typeof(Style),
                 typeof(MarkdownScrollViewer),
-                new PropertyMetadata(null, UpdateStyle));
+                new PropertyMetadata(MdStyle.Standard, UpdateStyle));
 
         public static readonly DependencyProperty MarkdownStyleNameProperty =
             DependencyProperty.Register(
             nameof(MarkdownStyleName),
             typeof(string),
             typeof(MarkdownScrollViewer),
-            new PropertyMetadata(null, UpdateStyleName));
+            new PropertyMetadata(nameof(MdStyle.Standard), UpdateStyleName));
 
         public static readonly DependencyProperty AssetPathRootProperty =
             DependencyProperty.Register(
@@ -253,7 +253,6 @@ public ClickAction ClickAction
         public MarkdownScrollViewer()
         {
             Engine = new Markdown();
-            SetCurrentValue(MarkdownStyleNameProperty, nameof(MdStyle.Standard));
         }
 
         private void UpdateClickAction()

diff --git a/MdXaml/MdXaml.csproj b/MdXaml/MdXaml.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageId>MdXaml</PackageId>
-    <Version>1.14.0</Version>
+    <Version>1.15.0</Version>
     <Authors>Bevan Arps(original); whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>

diff --git a/MdXaml/MdXamlMigfree.csproj b/MdXaml/MdXamlMigfree.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageId>MdXaml_migfree</PackageId>
-    <Version>1.14.0</Version>
+    <Version>1.15.0</Version>
     <Authors>Bevan Arps(original); whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>