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

Fixed material selector colors.

Browse source
This commit is contained in:
Lars Brubaker 2017-09-08 17:13:06 -07:00
parent 985473e287
commit e4ffe2ec8c
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -1711,20 +1711,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
buttonPanel.AddChild(colorSelectionContainer);
string extruderLabelText = string.Format("{0} {1}", "Extruder".Localize(), extruderIndex + 1);
string materialLabelText = string.Format("{0} {1}", "Material".Localize(), extruderIndex + 1);
RadioButton extruderSelection = new RadioButton(extruderLabelText, textColor: ActiveTheme.Instance.PrimaryTextColor);
extruderButtons.Add(extruderSelection);
extruderSelection.SiblingRadioButtonList = extruderButtons;
colorSelectionContainer.AddChild(extruderSelection);
RadioButton materialSelection = new RadioButton(materialLabelText, textColor: RGBA_Bytes.Black);
extruderButtons.Add(materialSelection);
materialSelection.SiblingRadioButtonList = extruderButtons;
colorSelectionContainer.AddChild(materialSelection);
colorSelectionContainer.AddChild(new HorizontalSpacer());
int extruderIndexCanPassToClick = extruderIndex;
extruderSelection.Click += (sender, e) =>
materialSelection.Click += (sender, e) =>
{
if (Scene.HasSelection)
{
Scene.SelectedItem.MaterialIndex = extruderIndexCanPassToClick;
PartHasBeenChanged();
// "View 3D Overflow Menu" // the menu to click on
// "Materials Option" // the item to highlight
//HelpSystem.
}
};
@ -2540,6 +2544,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Materials option
{
RadioButton materialsCheckBox = new RadioButton("Materials".Localize(), textColor: itemTextColor);
materialsCheckBox.Name = "Materials Option";
materialsCheckBox.Checked = (meshViewerWidget.RenderType == RenderTypes.Materials);
materialsCheckBox.CheckedStateChanged += (sender, e) =>
@ -2554,7 +2559,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
container.AddChild(materialsCheckBox);
}
// overhang setting
{
RadioButton renderTypeCheckBox = new RadioButton("Overhang".Localize(), textColor: itemTextColor);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 2e3142d1e9863aaba41ae8b2962773add3de13eb
Subproject commit 135f2129e7f9b08c627d90774c7e0fab5cc27f0b