Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

This commit is contained in:
larsbrubaker 2014-09-24 11:07:31 -07:00
commit 4e10293225
16 changed files with 402 additions and 58 deletions

View file

@ -174,6 +174,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
sliceOptionsMenuDropList.NormalColor = new RGBA_Bytes(0, 0, 0, 0);
sliceOptionsMenuDropList.BorderColor = new RGBA_Bytes(0, 0, 0, 0);
sliceOptionsMenuDropList.BackgroundColor = new RGBA_Bytes(0, 0, 0, 0);
sliceOptionsMenuDropList.BorderWidth = 1;
sliceOptionsMenuDropList.BorderColor = ActiveTheme.Instance.SecondaryTextColor;
sliceOptionsMenuDropList.SelectionChanged += new EventHandler(MenuDropList_SelectionChanged);
SetMenuItems();