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

Put in max height for slice settings.

Browse source
This commit is contained in:
larsbrubaker 2014-05-07 16:12:46 -07:00
parent 87a29f3714
commit 48633bce32
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CustomWidgets/StyledDropDownList.cs
View file

@ -20,8 +20,8 @@ namespace MatterHackers.MatterControl
static RGBA_Bytes whiteSemiTransparent = new RGBA_Bytes(255, 255, 255, 100); static RGBA_Bytes whiteSemiTransparent = new RGBA_Bytes(255, 255, 255, 100);
static RGBA_Bytes whiteTransparent = new RGBA_Bytes(255, 255, 255, 0); static RGBA_Bytes whiteTransparent = new RGBA_Bytes(255, 255, 255, 0);
public StyledDropDownList(string noSelectionString, Direction direction = Direction.Down) public StyledDropDownList(string noSelectionString, Direction direction = Direction.Down, double maxHeight = 0)
: base(noSelectionString, whiteTransparent, whiteSemiTransparent, direction) : base(noSelectionString, whiteTransparent, whiteSemiTransparent, direction, maxHeight)
{ {
this.TextColor = ActiveTheme.Instance.PrimaryTextColor; this.TextColor = ActiveTheme.Instance.PrimaryTextColor;
this.MenuItemsBorderWidth = 1; this.MenuItemsBorderWidth = 1;

2
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -643,7 +643,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
case OrganizerSettingsData.DataEditTypes.LIST: case OrganizerSettingsData.DataEditTypes.LIST:
{ {
StyledDropDownList selectableOptions = new StyledDropDownList("None", Direction.Up); StyledDropDownList selectableOptions = new StyledDropDownList("None", maxHeight: 200);
selectableOptions.Margin = new BorderDouble(); selectableOptions.Margin = new BorderDouble();
string[] listItems = settingData.ExtraSettings.Split(','); string[] listItems = settingData.ExtraSettings.Split(',');

2
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{ {
foreach (string name in replaceWithSettingsStrings) foreach (string name in replaceWithSettingsStrings)
{ {
string thingToReplace = "{" + "{0}.FormatWith(name)" + "}"; string thingToReplace = "{" + "{0}".FormatWith(name) + "}";
gcodeWithMacros = gcodeWithMacros.Replace(thingToReplace, ActiveSliceSettings.Instance.GetActiveValue(name)); gcodeWithMacros = gcodeWithMacros.Replace(thingToReplace, ActiveSliceSettings.Instance.GetActiveValue(name));
} }