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

Simplify Winforms provider specification

Browse source
This commit is contained in:
John Lewin 2018-10-03 12:27:03 -07:00
parent 01e5c13aba
commit 9ecb39a703
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Program.cs
View file

@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
// Set default Agg providers
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider`1[[MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32]], agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.OpenGLWinformsWindowProvider, agg_platform_win32";
//AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms";
string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 6a62ba1001867dc8b69c20f51476bd6cd8cce6c8
Subproject commit 234526f77d66ca80ee36266771b819eef1341bc5

2
Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
View file

@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
for (int i = 0; i < 3; i++)
{
var section = i * 3 + 1;
var section = (i * 3) + 1;
waitForPage($"Step {section} of 9");
testRunner.ClickByName("Move Z positive");

2
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -625,7 +625,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Environment.CurrentDirectory = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "bin", outputDirectory);
// Override the default SystemWindow type without config.json
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider`1[[MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32]], agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.OpenGLWinformsWindowProvider, agg_platform_win32";
#if !__ANDROID__
// Set the static data to point to the directory of MatterControl