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

Put in view keyboard controls

Browse source
This commit is contained in:
Lars Brubaker 2018-01-18 09:38:57 -08:00
parent de5d70c717
commit f48764ba4b
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -52,7 +52,7 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.PartPreviewWindow namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
public class View3DWidget : GuiWidget public class View3DWidget : GuiWidget
{ {
private bool DoBooleanTest = false; private bool DoBooleanTest = false;
private bool deferEditorTillMouseUp = false; private bool deferEditorTillMouseUp = false;
@ -847,10 +847,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public override void OnMouseDown(MouseEventArgs mouseEvent) public override void OnMouseDown(MouseEventArgs mouseEvent)
{ {
// Show transform override // Show transform override
if (activeButtonBeforeMouseOverride == null && mouseEvent.Button == MouseButtons.Right) if (activeButtonBeforeMouseOverride == null
&& (mouseEvent.Button == MouseButtons.Right || Keyboard.IsKeyDown(Keys.Control)))
{ {
activeButtonBeforeMouseOverride = viewControls3D.ActiveButton; if (Keyboard.IsKeyDown(Keys.Shift))
viewControls3D.ActiveButton = ViewControls3DButtons.Rotate; {
activeButtonBeforeMouseOverride = viewControls3D.ActiveButton;
viewControls3D.ActiveButton = ViewControls3DButtons.Translate;
}
else
{
activeButtonBeforeMouseOverride = viewControls3D.ActiveButton;
viewControls3D.ActiveButton = ViewControls3DButtons.Rotate;
}
} }
else if (activeButtonBeforeMouseOverride == null && mouseEvent.Button == MouseButtons.Middle) else if (activeButtonBeforeMouseOverride == null && mouseEvent.Button == MouseButtons.Middle)
{ {
@ -870,6 +879,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (this.TrackballTumbleWidget.UnderMouseState == UnderMouseState.FirstUnderMouse) if (this.TrackballTumbleWidget.UnderMouseState == UnderMouseState.FirstUnderMouse)
{ {
if (mouseEvent.Button == MouseButtons.Left if (mouseEvent.Button == MouseButtons.Left
&& viewControls3D.ActiveButton == ViewControls3DButtons.PartSelect
&& &&
(ModifierKeys == Keys.Shift || ModifierKeys == Keys.Control) (ModifierKeys == Keys.Shift || ModifierKeys == Keys.Control)
|| ( || (

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 9de4051d4a7b124a105e49da6cb8b0fd2304b258 Subproject commit 23fa4c35f38e23f43f0a810d5c66381a8a960183