Make sure we keep the disable widget on top

This commit is contained in:
Lars Brubaker 2017-02-02 17:06:01 -08:00
parent 8a9467be3a
commit c3f0957eed
2 changed files with 25 additions and 7 deletions

View file

@ -21,16 +21,22 @@ namespace MatterHackers.MatterControl.CustomWidgets
&& Parent.Height > 0 && Parent.Height > 0
&& Parent.Children.Count > 1) && Parent.Children.Count > 1)
{ {
if(Children.IndexOf(disableOverlay) != Children.Count-1)
var childBounds = GetChildrenBoundsIncludingMargins(considerChild: (parent, child) =>
{
if (child == disableOverlay)
{ {
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) if (childBounds != RectangleDouble.ZeroIntersection)
{ {

View file

@ -5881,3 +5881,15 @@ Translated:The starting height (z) of the print head before probing each print l
English:Probe Start Height English:Probe Start Height
Translated: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