diff --git a/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs b/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs index dc6a9184d..ad05e31c5 100644 --- a/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs @@ -34,6 +34,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Markdig.Agg; +using Markdig.Renderers.Agg.Inlines; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; @@ -268,6 +269,8 @@ namespace MatterHackers.MatterControl.DesignTools if (markdownWidget.Markdown != description) { markdownWidget.Markdown = description; + + FixSelectableBasedOnLinks(markdownWidget); } markdownWidget.Width = width; @@ -298,6 +301,24 @@ namespace MatterHackers.MatterControl.DesignTools graphics2DOpenGL.RenderTransformedPath(transform, new Ellipse(0, 0, 5, 5), theme.PrimaryAccentColor, false); } + private void FixSelectableBasedOnLinks(MarkdownWidget markdownWidget) + { + if (markdownWidget.Descendants().Any()) + { + foreach (var child in markdownWidget.Children) + { + child.Selectable = true; + } + } + else + { + foreach (var child in markdownWidget.Children) + { + child.Selectable = false; + } + } + } + public AxisAlignedBoundingBox GetEditorWorldspaceAABB(Object3DControlsLayer layer) { return AxisAlignedBoundingBox.Empty(); @@ -328,17 +349,15 @@ namespace MatterHackers.MatterControl.DesignTools markdownWidget.Markdown = Description; markdownWidget.Width = width; markdownWidget.ScrollArea.VAnchor = VAnchor.Fit | VAnchor.Center; - foreach (var child in markdownWidget.Children) - { - child.Selectable = false; - } + + FixSelectableBasedOnLinks(markdownWidget); controlLayer.GuiSurface.AddChild(markdownWidget); controlLayer.GuiSurface.AfterDraw += GuiSurface_AfterDraw; markdownWidget.MouseDown += MarkdownWidget_MouseDown; markdownWidget.MouseMove += MarkdownWidget_MouseMove; markdownWidget.MouseUp += MarkdownWidget_MouseUp; - markdownWidget.KeyDown += MarkdownWidget_KeyDown; ; + markdownWidget.KeyDown += MarkdownWidget_KeyDown; } } diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index adc7d87d2..3898c7df7 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -1757,7 +1757,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec } Console.WriteLine("Exiting ReadFromPrinter method: " + CommunicationState.ToString()); - if (CommunicationState == CommunicationStates.Connected) + if (CommunicationState != CommunicationStates.Disconnecting) { // we are in an error condition where we have lost the com port CommunicationState = CommunicationStates.Disconnected; diff --git a/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs b/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs index 6eecdfee1..b42dddcbe 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs @@ -94,7 +94,14 @@ namespace Markdig.Agg this.AddChild(contentPanel); } - public void LoadUri(Uri uri, HelpArticle sourceArticle = null) + public override void OnSizeChanged(EventArgs e) + { + contentPanel.Height = contentPanel.Height - 1; + + base.OnSizeChanged(e); + } + + public void LoadUri(Uri uri, HelpArticle sourceArticle = null) { try { diff --git a/StaticData/Images/Thumbnails/11417487296858350101-256x256.png b/StaticData/Images/Thumbnails/3705231141807988552-256x256.png similarity index 100% rename from StaticData/Images/Thumbnails/11417487296858350101-256x256.png rename to StaticData/Images/Thumbnails/3705231141807988552-256x256.png diff --git a/StaticData/Materials/BASF/PRO1 Tough PLA.material b/StaticData/Materials/BASF/PRO1 Tough PLA.material index c8b998bfe..1ca21a9ad 100644 --- a/StaticData/Materials/BASF/PRO1 Tough PLA.material +++ b/StaticData/Materials/BASF/PRO1 Tough PLA.material @@ -22,7 +22,7 @@ "max_fan_speed_layer_time": "60", "min_fan_speed": "60", "min_fan_speed_layer_time": "180", - "temperature": "220" + "temperature": "215" } ], "OemLayer": null, diff --git a/StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx b/StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx new file mode 100644 index 000000000..d54d6bc77 Binary files /dev/null and b/StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx differ diff --git a/StaticData/OEMSettings/SampleParts/Retraction Cubes.stl b/StaticData/OEMSettings/SampleParts/Retraction Cubes.stl deleted file mode 100644 index 9756e5e03..000000000 Binary files a/StaticData/OEMSettings/SampleParts/Retraction Cubes.stl and /dev/null differ