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

Merge branch 'smash_1.7.1' into design_tools

Browse source 
# Conflicts:
#	PartPreviewWindow/View3D/View3DWidget.cs
#	SlicerConfiguration/SliceSettingsWidget.cs
#	SlicerConfiguration/SlicingQueue.cs
#	StaticData/SliceSettings/Properties.json
This commit is contained in:
Lars Brubaker 2017-05-19 14:56:16 -07:00
commit 352eb792f1
63 changed files with 30032 additions and 26547 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Queue/QueueDataView.cs
View file

@ -268,6 +268,14 @@ namespace MatterHackers.MatterControl.PrintQueue
private void itemHolder_MouseDownInBounds(object sender, MouseEventArgs mouseEvent)
{
// we can only change the queue selection when we are not printing
if(PrinterConnectionAndCommunication.Instance.PrinterIsPrinting
|| PrinterConnectionAndCommunication.Instance.PrinterIsPaused
|| PrinterConnectionAndCommunication.Instance.CommunicationState == PrinterConnectionAndCommunication.CommunicationStates.PreparingToPrint)
{
return;
}
// Hard-coded processing rule to avoid changing the SelectedIndex when clicks occur
// with the thumbnail region - aka the first 55 pixels
if (!EditMode && mouseEvent.X < 56) return;