From c3f0957eed09b3cf8eeef2d1a9beb5ebadfe50eb Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 2 Feb 2017 17:06:01 -0800 Subject: [PATCH] Make sure we keep the disable widget on top --- CustomWidgets/DisableableWidget.cs | 20 +++++++++++++------- StaticData/Translations/Master.txt | 12 ++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/CustomWidgets/DisableableWidget.cs b/CustomWidgets/DisableableWidget.cs index 09f592958..691e1a645 100644 --- a/CustomWidgets/DisableableWidget.cs +++ b/CustomWidgets/DisableableWidget.cs @@ -21,16 +21,22 @@ namespace MatterHackers.MatterControl.CustomWidgets && Parent.Height > 0 && Parent.Children.Count > 1) { - - var childBounds = GetChildrenBoundsIncludingMargins(considerChild: (parent, child) => - { - if (child == disableOverlay) + if(Children.IndexOf(disableOverlay) != Children.Count-1) { - return false; + Children.RemoveAt(Children.IndexOf(disableOverlay)); + disableOverlay.ClearRemovedFlag(); + Children.Add(disableOverlay); } - return true; - }); + var childBounds = GetChildrenBoundsIncludingMargins(considerChild: (parent, child) => + { + if (child == disableOverlay) + { + return false; + } + + return true; + }); if (childBounds != RectangleDouble.ZeroIntersection) { diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 8c89e9861..a08198aa9 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -5881,3 +5881,15 @@ Translated:The starting height (z) of the print head before probing each print l English:Probe Start Height Translated:Probe Start Height +English:Controls the speed of printer moves +Translated:Controls the speed of printer moves + +English:Controls the amount of extrusion +Translated:Controls the amount of extrusion + +English:feedrate_ratio +Translated:feedrate_ratio + +English:extrusion_ratio +Translated:extrusion_ratio +