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

Collapse method into caller, make evident it populates unitsArea

Browse source
This commit is contained in:
John Lewin 2017-09-13 21:23:29 -07:00
parent c22176634b
commit d1a05ad632
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -587,21 +587,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return leftSideGroupTabs;
}
private static GuiWidget GetExtraSettingsWidget(SliceSettingData settingData)
{
// List elements contain list values in the field which normally contains label details, skip generation of invalid labels
if (settingData.DataEditType == SliceSettingData.DataEditTypes.LIST
|| settingData.DataEditType == SliceSettingData.DataEditTypes.HARDWARE_PRESENT)
{
return null;
}
return new WrappedTextWidget(settingData.ExtraSettings.Localize(), pointSize: 8, textColor: ActiveTheme.Instance.PrimaryTextColor)
{
Margin = new BorderDouble(5, 0),
};
}
private class SettingsRow : FlowLayoutWidget
{
public event EventHandler StyleChanged;
@ -658,12 +643,18 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
};
this.AddChild(unitsArea);
var extraInfo = GetExtraSettingsWidget(settingData);
if (extraInfo != null)
// Populate unitsArea as appropriate
// List elements contain list values in the field which normally contains label details, skip generation of invalid labels
if (settingData.DataEditType != SliceSettingData.DataEditTypes.LIST
&& settingData.DataEditType != SliceSettingData.DataEditTypes.HARDWARE_PRESENT)
{
unitsArea.AddChild(extraInfo);
unitsArea.AddChild(
new WrappedTextWidget(settingData.ExtraSettings.Localize(), pointSize: 8, textColor: ActiveTheme.Instance.PrimaryTextColor)
{
Margin = new BorderDouble(5, 0),
});
}
restoreArea = new GuiWidget()
{
HAnchor = HAnchor.Absolute,