diff --git a/SetupWizard/HelpPage.cs b/SetupWizard/HelpPage.cs index dbb67d04c..953400844 100644 --- a/SetupWizard/HelpPage.cs +++ b/SetupWizard/HelpPage.cs @@ -251,7 +251,7 @@ namespace MatterHackers.MatterControl #if !__ANDROID__ if (treeView.SelectedNode.Tag is string path) { - markdownWidget.Load(new Uri($"https://matterhackers.github.io/MatterControl-Help/{path}")); + markdownWidget.LoadUri(new Uri($"https://matterhackers.github.io/MatterControl-Help/{path}")); } #endif }; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 9b6f83957..567928b41 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 9b6f83957f6bf795ff0b829ac7033a20a232c89e +Subproject commit 567928b4170ac786a5db3171edb2db3bc93d62b6 diff --git a/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs b/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs index ba2ec1e00..b1256b86e 100644 --- a/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs +++ b/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs @@ -7,7 +7,7 @@ using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg.Inlines { - public class LineBreakX : AutoFit{ } + public class LineBreakX : AutoFit, IHardBreak { } public class LineBreakSoftX : AutoFit{ } /// diff --git a/Utilities/MarkdigAgg/MarkdownWidget.cs b/Utilities/MarkdigAgg/MarkdownWidget.cs index 0b563dd4a..01d5f0f72 100644 --- a/Utilities/MarkdigAgg/MarkdownWidget.cs +++ b/Utilities/MarkdigAgg/MarkdownWidget.cs @@ -46,7 +46,7 @@ namespace Markdig.Agg { markdownDocument.BaseUri = contentUri; - this.Load(contentUri); + this.LoadUri(contentUri); } public MarkdownWidget(bool scrollContent = true) @@ -81,7 +81,7 @@ namespace Markdig.Agg this.AddChild(contentPanel); } - public void Load(Uri uri) + public void LoadUri(Uri uri) { var webClient = new WebClient(); this.Markdown = webClient.DownloadString(uri);