nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure markdown line breaks do a line break

Browse source 
Remove warning on Load redefine
This commit is contained in:
Lars Brubaker 2018-07-09 13:58:42 -07:00
parent b431c1de37
commit 4e817289dc
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SetupWizard/HelpPage.cs
View file

@ -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
};

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 9b6f83957f6bf795ff0b829ac7033a20a232c89e
Subproject commit 567928b4170ac786a5db3171edb2db3bc93d62b6

2
Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs
View file

@ -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{ }
/// <summary>

4
Utilities/MarkdigAgg/MarkdownWidget.cs
View file

@ -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);