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

Handle reentrant calls to ShowSystemWindow

Browse source 
- Issue MatterHackers/MCCentral#4227
Load filament wizard isn't switching panels correctly
This commit is contained in:
John Lewin 2018-10-03 11:10:46 -07:00
parent e38e0eb42f
commit 0941f655eb
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControl.Winforms/WinformsSingleWindowProvider.cs
View file

@ -46,8 +46,9 @@ namespace MatterHackers.MatterControl
platformWindow = openGLPlatformWindow;
}
systemWindow.PlatformWindow = openGLPlatformWindow;
base.ShowSystemWindow(systemWindow);
systemWindow.PlatformWindow = openGLPlatformWindow;
}
}
}

5
MatterControlLib/CustomWidgets/SingleWindowProvider.cs
View file

@ -56,6 +56,11 @@ namespace MatterHackers.Agg.UI
}
else
{
if (systemWindow.PlatformWindow != null)
{
return;
}
var overlayWindow = new SystemWindow(_openWindows.FirstOrDefault().Width, _openWindows.FirstOrDefault().Height)
{
PlatformWindow = platformWindow