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

Move keyboard hooks to parent

Browse source
This commit is contained in:
John Lewin 2017-07-10 12:32:41 -07:00
parent b2c898be6c
commit a50e8acc2a
2 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -68,8 +68,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private PrinterConfig printer;
private ViewControls3D viewControls3D;
private SystemWindow parentSystemWindow;
public ViewGcodeBasic(Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape, ViewControls3D viewControls3D)
{
printer = ApplicationController.Instance.Printer;
@ -97,34 +95,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ApplicationController.Instance.AdvancedControlsPanelReloading.RegisterEvent((s, e) => printer.BedPlate.GCodeRenderer?.Clear3DGCode(), ref unregisterEvents);
}
public override void OnLoad(EventArgs args)
{
// Find and hook the parent system window KeyDown event
if (this.Parents<SystemWindow>().FirstOrDefault() is SystemWindow systemWindow)
{
systemWindow.KeyDown += Parent_KeyDown;
parentSystemWindow = systemWindow;
}
base.OnLoad(args);
}
private void Parent_KeyDown(object sender, KeyEventArgs keyEvent)
{
if (this.Visible)
{
switch(keyEvent.KeyCode)
{
case Keys.Up:
printer.BedPlate.ActiveLayerIndex += 1;
break;
case Keys.Down:
printer.BedPlate.ActiveLayerIndex -= 1;
break;
}
}
}
private GCodeFile loadedGCode => printer.BedPlate.LoadedGCode;
internal void CreateAndAddChildren()
@ -248,13 +218,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public override void OnClosed(ClosedEventArgs e)
{
unregisterEvents?.Invoke(this, null);
// Find and unhook the parent system window KeyDown event
if (parentSystemWindow != null)
{
parentSystemWindow.KeyDown -= Parent_KeyDown;
}
base.OnClosed(e);
}
}