From f10788c02cbe62f751f4a8ecc0854f830dfb8703 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Tue, 11 Sep 2018 07:49:09 -0700 Subject: [PATCH 1/2] Make sure we respect the expandingContent flag --- MatterControlLib/PartPreviewWindow/SectionWidget.cs | 5 ++++- Submodules/agg-sharp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/SectionWidget.cs b/MatterControlLib/PartPreviewWindow/SectionWidget.cs index 9af30b854..6e01d5a2d 100644 --- a/MatterControlLib/PartPreviewWindow/SectionWidget.cs +++ b/MatterControlLib/PartPreviewWindow/SectionWidget.cs @@ -72,7 +72,10 @@ namespace MatterHackers.MatterControl.CustomWidgets }; checkbox.CheckedStateChanged += (s, e) => { - ContentPanel.Visible = checkbox.Checked; + if (expandingContent) + { + ContentPanel.Visible = checkbox.Checked; + } // TODO: Remove this Height = 10 and figure out why the layout engine is not sizing these correctly without this. ContentPanel.Height = 10; }; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 45c8b0347..b59a1957e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 45c8b034752b11b7a7f584148845865dd39f24de +Subproject commit b59a1957eb2fbdbffe3b21306f124cd48e438d75 From 0b50b46c2cddb53b42502bee1afb19de2208f185 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Tue, 11 Sep 2018 07:55:02 -0700 Subject: [PATCH 2/2] Put in a border color for the color display --- MatterControlLib/PartPreviewWindow/ItemColorButton.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/ItemColorButton.cs b/MatterControlLib/PartPreviewWindow/ItemColorButton.cs index 9c30e4241..1c6ff6365 100644 --- a/MatterControlLib/PartPreviewWindow/ItemColorButton.cs +++ b/MatterControlLib/PartPreviewWindow/ItemColorButton.cs @@ -62,8 +62,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow Height = scaledButtonSize, HAnchor = HAnchor.Center, VAnchor = VAnchor.Center, - DisabledColor = theme.MinimalShade - }; + DisabledColor = theme.MinimalShade, + Border = new BorderDouble(1), + BorderColor = theme.GetBorderColor(200) + }; this.AddChild(colorButton); }