From c7b8b42978801b1ae98d758f5e0efc9cecd2d671 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 27 Aug 2018 13:49:57 -0700 Subject: [PATCH] Disallow Model -> Right Click in GCode views - Issue MatterHackers/MCCentral#4034 Right click fires on model objects in GCode view --- PartPreviewWindow/View3D/View3DWidget.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 332b9d586..066355912 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -1156,7 +1156,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { var info = new IntersectInfo(); - if (FindHitObject3D(mouseEvent.Position, ref info) is IObject3D hitObject) + if (FindHitObject3D(mouseEvent.Position, ref info) is IObject3D hitObject + && this.Printer?.ViewState.ViewMode == PartViewMode.Model) // Disallow Model -> Right Click in GCode views { // Object3D/hit item context menu if (hitObject != selectedItem) @@ -1237,7 +1238,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow theme.CreateMenuItems(menu, actions, emptyMenu: false); }); } - else + else // Allow right click on bed in all modes { // Workspace/plate context menu UiThread.RunOnIdle(() =>