From 48633bce32eeaebf2db5216480ad7a94c8ffc73e Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Wed, 7 May 2014 16:12:46 -0700 Subject: [PATCH] Put in max height for slice settings. --- CustomWidgets/StyledDropDownList.cs | 4 ++-- SlicerConfiguration/SliceSettingsWidget.cs | 2 +- SlicerConfiguration/SlicerMapping/MappingClasses.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CustomWidgets/StyledDropDownList.cs b/CustomWidgets/StyledDropDownList.cs index dae28cb6d..0880ba3a9 100644 --- a/CustomWidgets/StyledDropDownList.cs +++ b/CustomWidgets/StyledDropDownList.cs @@ -20,8 +20,8 @@ namespace MatterHackers.MatterControl static RGBA_Bytes whiteSemiTransparent = new RGBA_Bytes(255, 255, 255, 100); static RGBA_Bytes whiteTransparent = new RGBA_Bytes(255, 255, 255, 0); - public StyledDropDownList(string noSelectionString, Direction direction = Direction.Down) - : base(noSelectionString, whiteTransparent, whiteSemiTransparent, direction) + public StyledDropDownList(string noSelectionString, Direction direction = Direction.Down, double maxHeight = 0) + : base(noSelectionString, whiteTransparent, whiteSemiTransparent, direction, maxHeight) { this.TextColor = ActiveTheme.Instance.PrimaryTextColor; this.MenuItemsBorderWidth = 1; diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 918f702b6..7d81576dd 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -643,7 +643,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration case OrganizerSettingsData.DataEditTypes.LIST: { - StyledDropDownList selectableOptions = new StyledDropDownList("None", Direction.Up); + StyledDropDownList selectableOptions = new StyledDropDownList("None", maxHeight: 200); selectableOptions.Margin = new BorderDouble(); string[] listItems = settingData.ExtraSettings.Split(','); diff --git a/SlicerConfiguration/SlicerMapping/MappingClasses.cs b/SlicerConfiguration/SlicerMapping/MappingClasses.cs index 486d8d74f..17f281960 100644 --- a/SlicerConfiguration/SlicerMapping/MappingClasses.cs +++ b/SlicerConfiguration/SlicerMapping/MappingClasses.cs @@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { foreach (string name in replaceWithSettingsStrings) { - string thingToReplace = "{" + "{0}.FormatWith(name)" + "}"; + string thingToReplace = "{" + "{0}".FormatWith(name) + "}"; gcodeWithMacros = gcodeWithMacros.Replace(thingToReplace, ActiveSliceSettings.Instance.GetActiveValue(name)); }