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

Merge pull request #4938 from larsbrubaker/master

Browse source 
main
This commit is contained in:
Lars Brubaker 2020-12-25 07:51:25 -08:00 • committed by GitHub
commit 111ac05f7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs
View file

@ -3,7 +3,6 @@
// See the LICENSE.md file in the project root for more information.
using Markdig.Syntax;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl;

3
MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs
View file

@ -2,10 +2,7 @@
// This file is licensed under the MIT license.
// See the LICENSE.md file in the project root for more information.
using Markdig.Renderers.Agg.Inlines;
using Markdig.Syntax;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
namespace Markdig.Renderers.Agg
{

1
MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs
View file

@ -32,7 +32,6 @@ using System.Collections.Generic;
using System.Net;
using Markdig.Renderers;
using Markdig.Renderers.Agg;
using Markdig.Syntax.Inlines;
using MatterHackers.Agg.UI;
namespace Markdig.Agg

1
MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs
View file

@ -3,7 +3,6 @@
// See the LICENSE.md file in the project root for more information.
using Markdig.Syntax;
using MatterHackers.Agg.UI;
namespace Markdig.Renderers.Agg
{

1
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs
View file

@ -4,7 +4,6 @@
using System;
using Markdig.Syntax.Inlines;
using MatterHackers.Agg.UI;
namespace Markdig.Renderers.Agg.Inlines
{

1
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs
View file

@ -3,7 +3,6 @@
// See the LICENSE.md file in the project root for more information.
using Markdig.Syntax.Inlines;
using MatterHackers.Agg.UI;
namespace Markdig.Renderers.Agg.Inlines
{

1
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs
View file

@ -3,7 +3,6 @@
// See the LICENSE.md file in the project root for more information.
using Markdig.Syntax.Inlines;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
namespace Markdig.Renderers.Agg.Inlines

1
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs
View file

@ -3,7 +3,6 @@
// See the LICENSE.md file in the project root for more information.
using Markdig.Syntax.Inlines;
using MatterHackers.Agg.UI;
namespace Markdig.Renderers.Agg.Inlines
{

3
Program.cs
View file

@ -104,7 +104,10 @@ namespace MatterHackers.MatterControl
// Set default Agg providers
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.GlfwProvider.GlfwWindowProvider, MatterHackers.GlfwProvider";
// for now we will ship release with the old renderer
#if !DEBUG
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms";
#endif
string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 720454009fedaec204b041fa934e0eeb4d2b0f5f
Subproject commit 8bae949da8f042488815104f9bedbb08b919dd64