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

Make sure the gcode view is always hooked up to the right window for up and down arrows.

Browse source
This commit is contained in:
larsbrubaker 2015-01-09 08:28:40 -08:00
parent 6349ce14de
commit d16a2a7004
1 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -726,6 +726,34 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SetAnimationPosition();
}
EnsureKeyDownHooked();
if (partToStartLoadingOnFirstDraw != null)
{
gcodeViewWidget.LoadInBackground(partToStartLoadingOnFirstDraw);
partToStartLoadingOnFirstDraw = null;
}
base.OnDraw(graphics2D);
}
private void EnsureKeyDownHooked()
{
// let's just check that we are still hooked up to our parent window (this is to make pop outs work correctly)
if (widgetThatHasKeyDownHooked != null)
{
GuiWidget topParent = Parent;
while (topParent as SystemWindow == null)
{
topParent = topParent.Parent;
}
if (topParent != widgetThatHasKeyDownHooked)
{
widgetThatHasKeyDownHooked.KeyDown -= Parent_KeyDown;
widgetThatHasKeyDownHooked = null;
}
}
if (widgetThatHasKeyDownHooked == null)
{
GuiWidget parent = Parent;
@ -736,12 +764,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
parent.KeyDown += Parent_KeyDown;
widgetThatHasKeyDownHooked = parent;
}
if (partToStartLoadingOnFirstDraw != null)
{
gcodeViewWidget.LoadInBackground(partToStartLoadingOnFirstDraw);
partToStartLoadingOnFirstDraw = null;
}
base.OnDraw(graphics2D);
}
void Parent_KeyDown(object sender, KeyEventArgs keyEvent)