From dd6c105fd3cd461e69fa0e4d3ce68d9f319ae91d Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 10 May 2018 17:21:59 -0700 Subject: [PATCH] Switch from GCode to Model view on drag over - Issue MatterHackers/MatterControl#3148 After deleting obj in GCode view, model stays visually (kinda confusing?) --- PartPreviewWindow/View3D/View3DWidget.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 123c8432e..b7fce9aaf 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -347,6 +347,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public bool DragOperationActive { get; private set; } public InsertionGroup DragDropObject { get; private set; } + public ILibraryAssetStream SceneReplacement { get; private set; } /// @@ -371,8 +372,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } else { - // Otherwise begin an externally started DragDropOperation hard-coded to use LibraryView->SelectedItems + if (this.Printer != null + && this.Printer.ViewState.ViewMode != PartViewMode.Model) + { + this.Printer.ViewState.ViewMode = PartViewMode.Model; + } + // Otherwise begin an externally started DragDropOperation hard-coded to use LibraryView->SelectedItems this.StartDragDrop( // Project from ListViewItem to ILibraryItem ApplicationController.Instance.Library.ActiveViewWidget.SelectedItems.Select(l => l.Model),