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

make esc work on description and measure tools

Browse source 
issue: MatterHackers/MCCentral#6391
Make Esc on drag trace object work

issue: MatterHackers/MCCentral#6395
fix local positions on measure tool
This commit is contained in:
LarsBrubaker 2021-04-27 07:19:02 -07:00
parent a1f02aff54
commit d7e8ecc744
4 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
MatterControlLib/DesignTools/Primitives/TracedPositionObject3DControl.cs
View file

@ -63,6 +63,8 @@ namespace MatterHackers.MatterControl.DesignTools
public PlaneShape HitPlane { get; private set; }
public bool DownOnControl { get; private set; }
private Vector3 mouseDownPosition;
public TracedPositionObject3DControl(IObject3DControlContext object3DControlContext,
IObject3D owner,
Func<Vector3> getPosition,
@ -78,6 +80,19 @@ namespace MatterHackers.MatterControl.DesignTools
this.shape = SphereObject3D.CreateSphere(1, 15, 10);
collisionVolume = shape.CreateBVHData();
this.owner = owner;
Keyboard.StateChanged += Keyboard_StateChanged;
}
private void Keyboard_StateChanged(object sender, EventArgs e)
{
if (DownOnControl
&& Keyboard.IsKeyDown(Keys.Escape))
{
DownOnControl = false;
setPosition(mouseDownPosition);
return;
}
}
public bool DrawOnTop => true;
@ -92,6 +107,7 @@ namespace MatterHackers.MatterControl.DesignTools
public void Dispose()
{
Keyboard.StateChanged -= Keyboard_StateChanged;
}
public void Draw(DrawGlContentEventArgs e)
@ -130,6 +146,7 @@ namespace MatterHackers.MatterControl.DesignTools
public void OnMouseDown(Mouse3DEventArgs mouseEvent3D)
{
DownOnControl = true;
mouseDownPosition = getPosition();
// Make sure we always get a new hit plane
ResetHitPlane();
}