From e4ffe2ec8cc02e5d6b5d4eaec820c3569bbf322d Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 8 Sep 2017 17:13:06 -0700 Subject: [PATCH] Fixed material selector colors. --- PartPreviewWindow/View3D/View3DWidget.cs | 18 +++++++++++------- Submodules/agg-sharp | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 4ce470793..68366bfa2 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -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); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 2e3142d1e..135f2129e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 2e3142d1e9863aaba41ae8b2962773add3de13eb +Subproject commit 135f2129e7f9b08c627d90774c7e0fab5cc27f0b