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

Merge pull request #3720 from larsbrubaker/master

Browse source 
Make sure we respect the expandingContent flag
This commit is contained in:
johnlewin 2018-09-11 08:08:26 -07:00 • committed by GitHub
commit a30ccc33a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControlLib/PartPreviewWindow/ItemColorButton.cs
View file

@ -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);
}

5
MatterControlLib/PartPreviewWindow/SectionWidget.cs
View file

@ -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;
};

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 45c8b034752b11b7a7f584148845865dd39f24de
Subproject commit b59a1957eb2fbdbffe3b21306f124cd48e438d75